Diff to HTML by rtfpessoa

Files changed (141) hide show

.github/actions/install/action.yml +1 -1
.github/workflows/benchmarks.yml +1 -1
.github/workflows/build-linux-installer-deb.yml +4 -4
.github/workflows/build-linux-installer-rpm.yml +5 -5
.github/workflows/build-macos-installers.yml +4 -4
.github/workflows/build-windows-installer.yml +4 -4
.github/workflows/codeql-analysis.yml +3 -3
.github/workflows/test-single.yml +4 -4
.github/workflows/test.yml +9 -7
.github/workflows/upload-pypi-source.yml +1 -1
CHANGELOG.md +14 -0
README.md +6 -6
benchmarks/block_store.py +12 -12
benchmarks/coin_store.py +2 -1
benchmarks/streamable.py +2 -1
benchmarks/utils.py +1 -153
build_scripts/pyinstaller.spec +0 -33
chia/cmds/check_wallet_db.py +1 -1
chia/cmds/configure.py +4 -4
chia/cmds/show_funcs.py +1 -1
chia/cmds/wallet.py +14 -3
chia/cmds/wallet_funcs.py +3 -1
chia/consensus/block_body_validation.py +6 -4
chia/consensus/block_creation.py +2 -7
chia/consensus/block_header_validation.py +15 -22
chia/consensus/full_block_to_block_record.py +6 -6
chia/consensus/make_sub_epoch_summary.py +1 -1
chia/consensus/multiprocess_validation.py +2 -2
chia/daemon/server.py +3 -2
chia/data_layer/data_layer_util.py +4 -0
chia/data_layer/data_store.py +70 -41
chia/data_layer/util/benchmark.py +1 -1
chia/full_node/full_node.py +44 -25
chia/full_node/full_node_api.py +11 -15
chia/full_node/full_node_store.py +25 -21
chia/full_node/hint_management.py +2 -2
chia/full_node/subscriptions.py +157 -97
chia/full_node/weight_proof.py +27 -27
chia/plotting/cache.py +18 -1
chia/pools/pool_puzzles.py +2 -2
chia/rpc/full_node_rpc_api.py +15 -12
chia/rpc/full_node_rpc_client.py +4 -0
chia/rpc/wallet_rpc_api.py +1 -1
chia/rpc/wallet_rpc_client.py +255 -296
chia/simulator/block_tools.py +10 -10
chia/timelord/iters_from_block.py +3 -3
chia/timelord/timelord.py +13 -13
chia/timelord/timelord_state.py +7 -7
chia/types/blockchain_format/classgroup.py +2 -31
chia/types/blockchain_format/foliage.py +5 -58
chia/types/blockchain_format/pool_target.py +2 -11
chia/types/blockchain_format/proof_of_space.py +4 -14
chia/types/blockchain_format/reward_chain_block.py +3 -53
chia/types/blockchain_format/serialized_program.py +2 -112
chia/types/blockchain_format/slots.py +6 -51
chia/types/blockchain_format/sub_epoch_summary.py +2 -15
chia/types/blockchain_format/vdf.py +3 -18
chia/types/end_of_slot_bundle.py +2 -18
chia/types/full_block.py +3 -3
chia/types/header_block.py +3 -3
chia/types/transaction_queue_entry.py +3 -3
chia/types/unfinished_block.py +1 -1
chia/types/unfinished_header_block.py +1 -1
chia/types/weight_proof.py +7 -61
chia/util/full_block_utils.py +1 -3
chia/util/initial-config.yaml +5 -0
chia/util/keyring_wrapper.py +3 -3
chia/util/misc.py +25 -0
chia/util/profiler.py +16 -0
chia/util/recursive_replace.py +12 -2
chia/util/struct_stream.py +8 -1
chia/wallet/block_record.py +0 -37
chia/wallet/conditions.py +3 -3
chia/wallet/did_wallet/did_wallet.py +15 -21
chia/wallet/did_wallet/did_wallet_puzzles.py +13 -9
chia/wallet/key_val_store.py +2 -2
chia/wallet/lineage_proof.py +29 -1
chia/wallet/puzzles/tails.py +1 -1
chia/wallet/trade_manager.py +1 -1
chia/wallet/util/merkle_utils.py +2 -0
chia/wallet/util/peer_request_cache.py +1 -1
chia/wallet/vc_wallet/cr_cat_drivers.py +9 -4
chia/wallet/vc_wallet/vc_drivers.py +2 -8
chia/wallet/wallet_blockchain.py +3 -3
chia/wallet/wallet_node.py +1 -1
install.sh +3 -1
mypy-exclusions.txt +0 -12
setup.py +14 -14
tests/blockchain/test_blockchain.py +18 -24
tests/blockchain/test_lookup_fork_chain.py +1 -1
tests/build-job-matrix.py +2 -2
tests/cmds/wallet/test_did.py +1 -1
tests/cmds/wallet/test_wallet.py +3 -1
tests/core/data_layer/test_data_rpc.py +36 -0
tests/core/data_layer/test_data_store.py +37 -10
tests/core/full_node/stores/test_coin_store.py +5 -5
tests/core/full_node/stores/test_full_node_store.py +7 -5
tests/core/full_node/test_full_node.py +3 -5
tests/core/full_node/test_subscriptions.py +116 -70
tests/core/mempool/test_mempool_performance.py +2 -7
tests/core/server/test_loop.py +5 -0
tests/core/test_coins.py +1 -1
tests/core/test_full_node_rpc.py +4 -0
tests/core/util/test_keychain.py +5 -3
tests/core/util/test_streamable.py +1 -1
tests/pools/test_pool_wallet.py +1 -1
tests/tools/test_full_sync.py +1 -1
tests/tools/test_legacy_keyring.py +1 -1
tests/tools/test_run_block.py +1 -1
tests/util/benchmark_cost.py +2 -2
tests/util/benchmarks.py +155 -0
tests/util/full_sync.py +226 -0
tests/util/misc.py +7 -1
tests/util/run_block.py +161 -0
tests/util/test_full_block_utils.py +1 -1
tests/util/test_misc.py +106 -1
tests/util/test_network_protocol_test.py +26 -1
tests/util/test_recursive_replace.py +116 -0
tests/wallet/cat_wallet/test_cat_wallet.py +831 -906
tests/wallet/cat_wallet/test_offer_lifecycle.py +151 -204
tests/wallet/cat_wallet/test_trades.py +1 -1
tests/wallet/dao_wallet/test_dao_clvm.py +2 -2
tests/wallet/did_wallet/test_did.py +67 -4
tests/wallet/nft_wallet/test_nft_bulk_mint.py +6 -0
tests/wallet/nft_wallet/test_nft_offers.py +273 -0
tests/wallet/nft_wallet/test_nft_wallet.py +170 -174
tests/wallet/rpc/test_wallet_rpc.py +35 -20
tests/wallet/simple_sync/test_simple_sync_protocol.py +622 -628
tests/wallet/sync/test_wallet_sync.py +1087 -1143
tests/wallet/test_bech32m.py +4 -4
tests/wallet/test_puzzle_store.py +51 -52
tests/wallet/test_singleton.py +15 -14
tests/wallet/test_singleton_lifecycle.py +3 -4
tests/wallet/test_singleton_lifecycle_fast.py +11 -10
tests/wallet/test_util.py +87 -0
tests/wallet/test_wallet_blockchain.py +95 -76
tests/wallet/test_wallet_node.py +87 -88
tests/wallet/test_wallet_user_store.py +2 -1
tools/generate_chain.py +1 -1
tools/run_block.py +1 -155
tools/test_full_sync.py +2 -211

.github/actions/install/action.yml CHANGED Viewed

         @@@ -63,7 -63,7 +63,7 @@@ runs
     - name: Upload constraints file
       if: inputs.constraints-file-artifact-name != ''
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.constraints-file-artifact-name }}
         path: venv/constraints.txt

.github/workflows/benchmarks.yml CHANGED Viewed

         @@@ -115,7 -115,7 +115,7 @@@ jobs
       - name: Publish JUnit results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: junit-data
           path: junit-data/*

.github/workflows/build-linux-installer-deb.yml CHANGED Viewed

         @@@ -191,7 -191,7 +191,7 @@@ jobs
         sh build_linux_deb-2-installer.sh ${{ matrix.os.arch }}
     - name: Upload Linux artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: chia-installers-linux-deb-${{ matrix.os.arch }}
         path: ${{ github.workspace }}/build_scripts/final_installer/
         @@@ -233,7 -233,7 +233,7 @@@
         directories: ${{ steps.create-venv.outputs.activate-venv-directories }}
     - name: Download constraints file
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: constraints-file-${{ matrix.os.arch }}
         path: venv
         @@@ -243,7 -243,7 +243,7 @@@
         pip install --constraint venv/constraints.txt py3createtorrent
     - name: Download packages
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: chia-installers-linux-deb-${{ matrix.os.arch }}
         path: build_scripts/final_installer/
         @@@ -396,7 -396,7 +396,7 @@@
     - uses: Chia-Network/actions/clean-workspace@main
     - name: Download packages
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       id: download
       with:
         name: chia-installers-linux-deb-${{ matrix.arch.artifact-name }}

.github/workflows/build-linux-installer-rpm.yml CHANGED Viewed

         @@@ -184,7 -184,7 +184,7 @@@ jobs
         bash build_linux_rpm-2-installer.sh amd64
     - name: Upload fpm-generated rpm spec files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         if-no-files-found: error
         name: spec
         @@@ -193,7 -193,7 +193,7 @@@
           build_scripts/dist/gui.spec
     - name: Upload Linux artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: chia-installers-linux-rpm-intel
         path: ${{ github.workspace }}/build_scripts/final_installer/
         @@@ -229,7 -229,7 +229,7 @@@
         directories: ${{ steps.create-venv.outputs.activate-venv-directories }}
     - name: Download constraints file
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: constraints-file-intel
         path: venv
         @@@ -239,7 -239,7 +239,7 @@@
         pip install --constraint venv/constraints.txt py3createtorrent
     - name: Download packages
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: chia-installers-linux-rpm-intel
         path: build_scripts/final_installer/
         @@@ -394,7 -394,7 +394,7 @@@
     - uses: Chia-Network/actions/clean-workspace@main
     - name: Download packages
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       id: download
       with:
         name: chia-installers-linux-rpm-intel

.github/workflows/build-macos-installers.yml CHANGED Viewed

         @@@ -230,7 -230,7 +230,7 @@@ jobs
           sh build_macos-2-installer.sh
       - name: Upload MacOS artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: chia-installers-macos-dmg-${{ matrix.os.name }}
           path: ${{ github.workspace }}/build_scripts/final_installer/
         @@@ -284,7 -284,7 +284,7 @@@
           directories: ${{ steps.create-venv.outputs.activate-venv-directories }}
       - name: Download constraints file
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: constraints-file-${{ matrix.os.name }}
           path: venv
         @@@ -294,7 -294,7 +294,7 @@@
           pip install --constraint venv/constraints.txt py3createtorrent
       - name: Download packages
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: chia-installers-macos-dmg-${{ matrix.os.name }}
           path: build_scripts/final_installer/
         @@@ -437,7 -437,7 +437,7 @@@
     - uses: Chia-Network/actions/clean-workspace@main
     - name: Download packages
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       id: download
       with:
         name: chia-installers-macos-dmg-${{ matrix.arch.artifact-name }}

.github/workflows/build-windows-installer.yml CHANGED Viewed

         @@@ -258,7 -258,7 +258,7 @@@ jobs
         .\build_windows-2-installer.ps1
     - name: Upload Installer to artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: chia-installers-windows-exe-intel
         path: ${{ github.workspace }}\chia-blockchain-gui\release-builds\
         @@@ -302,7 -302,7 +302,7 @@@
         directories: ${{ steps.create-venv.outputs.activate-venv-directories }}
     - name: Download constraints file
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: constraints-file-intel
         path: venv
         @@@ -312,7 -312,7 +312,7 @@@
         pip install --constraint venv/constraints.txt py3createtorrent
     - name: Download packages
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: chia-installers-windows-exe-intel
         path: chia-blockchain-gui/release-builds/
         @@@ -434,7 -434,7 +434,7 @@@
     - uses: Chia-Network/actions/clean-workspace@main
     - name: Download packages
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: chia-installers-windows-exe-intel
         path: packages

.github/workflows/codeql-analysis.yml CHANGED Viewed

         @@@ -47,7 -47,7 +47,7 @@@ jobs
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
         @@@ -58,7 -58,7 +58,7 @@@
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
     # Γä╣∩╕Å Command-line programs to run using the OS shell.
     # ≡ƒôÜ https://git.io/JvXDl
         @@@ -72,4 -72,4 +72,4 @@@
     #   make release
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/test-single.yml CHANGED Viewed

         @@@ -228,9 -228,9 +228,9 @@@ jobs
           mv notchia/ chia/
       - name: Publish JUnit results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: junit-data
+          name: junit-data-${{ env.JOB_FILE_NAME }}
           path: junit-data/*
           if-no-files-found: error
         @@@ -243,9 -243,9 +243,9 @@@
           coverage report --rcfile=.coveragerc --show-missing
       - name: Publish coverage data
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: coverage-data
+          name: coverage-data-${{ env.JOB_FILE_NAME }}
           path: coverage-data/*
           if-no-files-found: error

.github/workflows/test.yml CHANGED Viewed

         @@@ -119,9 -119,9 +119,10 @@@ jobs
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Download Results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: junit-data
+          merge-multiple: true
+          pattern: junit-data-*
           path: junit-data
       - name: Format JUnit data and prepare results
         @@@ -135,7 -135,7 +136,7 @@@
           ls junit-results/*.xml | xargs --max-procs=10 --replace={} yq eval '.testsuites.testsuite |= sort_by(.+@name) | .testsuites.testsuite[].testcase |= sort_by(.+@classname, .+@name)' --inplace {}
       - name: Publish formatted JUnit data
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: junit-data
           path: junit-data/*
         @@@ -143,16 -143,16 +144,17 @@@
       - name: Publish JUnit results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: junit-results
           path: junit-results/*
           if-no-files-found: error
       - name: Download Coverage
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: coverage-data
+          merge-multiple: true
+          pattern: coverage-data-*
           path: coverage-data
       - name: Set up ${{ matrix.python.name }}
         @@@ -280,7 -280,7 +282,7 @@@
       - name: Publish coverage reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-reports
           path: coverage-reports/*

.github/workflows/upload-pypi-source.yml CHANGED Viewed

         @@@ -196,7 -196,7 +196,7 @@@ jobs
         python -m build --sdist --outdir dist .
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: dist
         path: ./dist

CHANGELOG.md CHANGED Viewed

         @@@ -6,6 -6,6 +6,20 @@@ The format is based on [Keep a Changelo
 and this project does not yet adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 for setuptools_scm/PEP 440 reasons.
+## 2.1.4 Chia blockchain 2024-01-10
+### Fixed
+* Update chia_rs to 0.2.15 for AMD K10 architecture (fixes #16386)
+### Changed
+* improved CPU usage due to tight loop in `send_transaction()`
+* improve performance of `total_mempool_fees()` and `total_mempool_cost()`
+* reduced the default maximum peer count to 40 from 80 (only applies to new configs)
+* changed to `normal` SQlite db sync option (previously was `full`)
+* reduced the mempool size to 10 blocks from 50 blocks (improves performance)
+* improve performance of the mempool by batch fetching items from the db
 ## 2.1.3 Chia blockchain 2023-12-18
 ### Fixed

README.md CHANGED Viewed

         @@@ -61,13 -61,13 +61,13 @@@ for consensus
 ## Installing
 Install instructions are available in the
-[INSTALL](https://github.com/Chia-Network/chia-blockchain/wiki/INSTALL)
+[Installation Details](https://docs.chia.net/installation/)
 section of the
-[chia-blockchain repository wiki](https://github.com/Chia-Network/chia-blockchain/wiki).
+[Chia Docs](https://docs.chia.net/introduction/).
 ## Running
-Once installed, a
-[Quick Start Guide](https://github.com/Chia-Network/chia-blockchain/wiki/Quick-Start-Guide)
-is available from the repository
-[wiki](https://github.com/Chia-Network/chia-blockchain/wiki).
+Once installed, an
+[Introduction to Chia](https://docs.chia.net/introduction/)
+guide is available in the
+[Chia Docs](https://docs.chia.net/introduction/).

benchmarks/block_store.py CHANGED Viewed

         @@@ -8,18 -8,18 +8,7 @@@ from pathlib import Pat
 from time import monotonic
 from typing import List
-from benchmarks.utils import (
-    clvm_generator,
-    rand_bytes,
-    rand_class_group_element,
-    rand_g1,
-    rand_g2,
-    rand_hash,
-    rand_vdf,
-    rand_vdf_proof,
-    rewards,
-    setup_db,
-)
+from benchmarks.utils import setup_db
 from chia.consensus.block_record import BlockRecord
 from chia.full_node.block_store import BlockStore
 from chia.types.blockchain_format.foliage import Foliage, FoliageBlockData, FoliageTransactionBlock, TransactionsInfo
         @@@ -31,6 -31,6 +20,17 @@@ from chia.types.blockchain_format.sized
 from chia.types.blockchain_format.sub_epoch_summary import SubEpochSummary
 from chia.types.full_block import FullBlock
 from chia.util.ints import uint8, uint32, uint64, uint128
+from tests.util.benchmarks import (
+    clvm_generator,
+    rand_bytes,
+    rand_class_group_element,
+    rand_g1,
+    rand_g2,
+    rand_hash,
+    rand_vdf,
+    rand_vdf_proof,
+    rewards,
+)
 # to run this benchmark:
 # python -m benchmarks.coin_store

benchmarks/coin_store.py CHANGED Viewed

         @@@ -8,11 -8,11 +8,12 @@@ from pathlib import Pat
 from time import monotonic
 from typing import List, Tuple
-from benchmarks.utils import rand_hash, rewards, setup_db
+from benchmarks.utils import setup_db
 from chia.full_node.coin_store import CoinStore
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.ints import uint32, uint64
+from tests.util.benchmarks import rand_hash, rewards
 # to run this benchmark:
 # python -m benchmarks.coin_store

benchmarks/streamable.py CHANGED Viewed

         @@@ -10,11 -10,11 +10,12 @@@ from typing import Any, Callable, Dict
 import click
-from benchmarks.utils import EnumType, get_commit_hash, rand_bytes, rand_full_block, rand_hash
+from benchmarks.utils import EnumType, get_commit_hash
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
 from chia.util.ints import uint8, uint64
 from chia.util.streamable import Streamable, streamable
+from tests.util.benchmarks import rand_bytes, rand_full_block, rand_hash
 # to run this benchmark:
 # python -m benchmarks.streamable

benchmarks/utils.py CHANGED Viewed

         @@@ -3,36 -3,36 +3,14 @@@ from __future__ import annotation
 import contextlib
 import enum
 import os
-import random
 import subprocess
 import sys
 from pathlib import Path
-from typing import Any, AsyncIterator, Generic, Optional, Tuple, Type, TypeVar, Union
+from typing import Any, AsyncIterator, Generic, Optional, Type, TypeVar, Union
 import click
-from chia_rs import AugSchemeMPL, G1Element, G2Element
-from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
-from chia.consensus.default_constants import DEFAULT_CONSTANTS
-from chia.types.blockchain_format.classgroup import ClassgroupElement
-from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.foliage import Foliage, FoliageBlockData, FoliageTransactionBlock, TransactionsInfo
-from chia.types.blockchain_format.pool_target import PoolTarget
-from chia.types.blockchain_format.proof_of_space import ProofOfSpace
-from chia.types.blockchain_format.reward_chain_block import RewardChainBlock
-from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32, bytes100
-from chia.types.blockchain_format.vdf import VDFInfo, VDFProof
-from chia.types.full_block import FullBlock
 from chia.util.db_wrapper import DBWrapper2
-from chia.util.ints import uint8, uint32, uint64, uint128
-# farmer puzzle hash
-ph = bytes32(b"a" * 32)
-with open(Path(os.path.realpath(__file__)).parent / "clvm_generator.bin", "rb") as f:
-    clvm_generator = f.read()
 _T_Enum = TypeVar("_T_Enum", bound=enum.Enum)
         @@@ -48,136 -48,136 +26,6 @@@ class EnumType(click.Choice, Generic[_T
         return self.__enum(converted_str)
-def rewards(height: uint32) -> Tuple[Coin, Coin]:
-    farmer_coin = create_farmer_coin(height, ph, uint64(250000000), DEFAULT_CONSTANTS.GENESIS_CHALLENGE)
-    pool_coin = create_pool_coin(height, ph, uint64(1750000000), DEFAULT_CONSTANTS.GENESIS_CHALLENGE)
-    return farmer_coin, pool_coin
-def rand_bytes(num: int) -> bytes:
-    ret = bytearray(num)
-    for i in range(num):
-        ret[i] = random.getrandbits(8)
-    return bytes(ret)
-def rand_hash() -> bytes32:
-    return bytes32(rand_bytes(32))
-def rand_g1() -> G1Element:
-    sk = AugSchemeMPL.key_gen(rand_bytes(96))
-    return sk.get_g1()
-def rand_g2() -> G2Element:
-    sk = AugSchemeMPL.key_gen(rand_bytes(96))
-    return AugSchemeMPL.sign(sk, b"foobar")
-def rand_class_group_element() -> ClassgroupElement:
-    return ClassgroupElement(bytes100(rand_bytes(100)))
-def rand_vdf() -> VDFInfo:
-    return VDFInfo(rand_hash(), uint64(random.randint(100000, 1000000000)), rand_class_group_element())
-def rand_vdf_proof() -> VDFProof:
-    return VDFProof(
-        uint8(1),  # witness_type
-        rand_hash(),  # witness
-        bool(random.randint(0, 1)),  # normalized_to_identity
-    )
-def rand_full_block() -> FullBlock:
-    proof_of_space = ProofOfSpace(
-        rand_hash(),
-        rand_g1(),
-        None,
-        rand_g1(),
-        uint8(0),
-        rand_bytes(8 * 32),
-    )
-    reward_chain_block = RewardChainBlock(
-        uint128(1),
-        uint32(2),
-        uint128(3),
-        uint8(4),
-        rand_hash(),
-        proof_of_space,
-        None,
-        rand_g2(),
-        rand_vdf(),
-        None,
-        rand_g2(),
-        rand_vdf(),
-        rand_vdf(),
-        True,
-    )
-    pool_target = PoolTarget(
-        rand_hash(),
-        uint32(0),
-    )
-    foliage_block_data = FoliageBlockData(
-        rand_hash(),
-        pool_target,
-        rand_g2(),
-        rand_hash(),
-        rand_hash(),
-    )
-    foliage = Foliage(
-        rand_hash(),
-        rand_hash(),
-        foliage_block_data,
-        rand_g2(),
-        rand_hash(),
-        rand_g2(),
-    )
-    foliage_transaction_block = FoliageTransactionBlock(
-        rand_hash(),
-        uint64(0),
-        rand_hash(),
-        rand_hash(),
-        rand_hash(),
-        rand_hash(),
-    )
-    farmer_coin, pool_coin = rewards(uint32(0))
-    transactions_info = TransactionsInfo(
-        rand_hash(),
-        rand_hash(),
-        rand_g2(),
-        uint64(0),
-        uint64(1),
-        [farmer_coin, pool_coin],
-    )
-    full_block = FullBlock(
-        [],
-        reward_chain_block,
-        rand_vdf_proof(),
-        rand_vdf_proof(),
-        rand_vdf_proof(),
-        rand_vdf_proof(),
-        rand_vdf_proof(),
-        foliage,
-        foliage_transaction_block,
-        transactions_info,
-        SerializedProgram.from_bytes(clvm_generator),
-        [],
-    )
-    return full_block
 @contextlib.asynccontextmanager
 async def setup_db(name: Union[str, os.PathLike[str]], db_version: int) -> AsyncIterator[DBWrapper2]:
     db_filename = Path(name)

build_scripts/pyinstaller.spec CHANGED Viewed

         @@@ -13,37 -13,37 +13,6 @@@ THIS_IS_MAC = platform.system().lower()
 ROOT = pathlib.Path(importlib.import_module("chia").__file__).absolute().parent.parent
-def solve_name_collision_problem(analysis):
-    """
-    There is a collision between the `chia` file name (which is the executable)
-    and the `chia` directory, which contains non-code resources like `english.txt`.
-    We move all the resources in the zipped area so there is no
-    need to create the `chia` directory, since the names collide.
-    Fetching data now requires going into a zip file, so it will be slower.
-    It's best if files that are used frequently are cached.
-    A sample large compressible file (1 MB of `/dev/zero`), seems to be
-    about eight times slower.
-    Note that this hack isn't documented, but seems to work.
-    """
-    zipped = []
-    datas = []
-    for data in analysis.datas:
-        if str(data[0]).startswith("chia/"):
-            zipped.append(data)
-        else:
-            datas.append(data)
-    # items in this field are included in the binary
-    analysis.zipped_data = zipped
-    # these items will be dropped in the root folder uncompressed
-    analysis.datas = datas
 keyring_imports = collect_submodules("keyring.backends")
 # keyring uses entrypoints to read keyring.backends from metadata file entry_points.txt.
         @@@ -176,8 -176,8 +145,6 @@@ def add_binary(name, path_to_script, co
         noarchive=False,
     )
-    solve_name_collision_problem(analysis)
     binary_pyz = PYZ(analysis.pure, analysis.zipped_data, cipher=block_cipher)
     binary_exe = EXE(

chia/cmds/check_wallet_db.py CHANGED Viewed

         @@@ -206,7 -206,7 +206,7 @@@ def print_min_max_derivation_for_wallet
 class WalletDBReader:
     db_wrapper: DBWrapper2  # TODO: Remove db_wrapper member
     config = {"db_readers": 1}
-    sql_log_path = None
+    sql_log_path: Optional[Path] = None
     verbose = False
     async def get_all_wallets(self) -> List[Wallet]:

chia/cmds/configure.py CHANGED Viewed

         @@@ -104,10 -104,10 +104,10 @@@ def configure
             if testnet == "true" or testnet == "t":
                 print("Setting Testnet")
                 testnet_port = "58444"
-                testnet_introducer = "introducer-testnet10.chia.net"
-                testnet_dns_introducer = "dns-introducer-testnet10.chia.net"
-                bootstrap_peers = ["testnet10-node.chia.net"]
-                testnet = "testnet10"
+                testnet_introducer = "introducer-testnet11.chia.net"
+                testnet_dns_introducer = "dns-introducer-testnet11.chia.net"
+                bootstrap_peers = ["testnet11-node-us-west-2.chia.net"]
+                testnet = "testnet11"
                 config["full_node"]["port"] = int(testnet_port)
                 if config["full_node"]["introducer_peer"] is None:
                     config["full_node"]["introducer_peer"] = {}

chia/cmds/show_funcs.py CHANGED Viewed

         @@@ -121,7 -121,7 +121,7 @@@ async def print_block_from_hash
             cost = str(full_block.transactions_info.cost)
             tx_filter_hash: Union[str, bytes32] = "Not a transaction block"
             if full_block.foliage_transaction_block:
-                tx_filter_hash = full_block.foliage_transaction_block.filter_hash
+                tx_filter_hash = bytes32(full_block.foliage_transaction_block.filter_hash)
             fees: Any = block.fees
         else:
             block_time_string = "Not a transaction block"

chia/cmds/wallet.py CHANGED Viewed

         @@@ -441,7 -441,7 +441,6 @@@ def add_token_cmd(wallet_rpc_port: Opti
     "-r",
     "--request",
     help="A wallet id of an asset to receive and the amount you wish to receive (formatted like wallet_id:amount)",
-    required=True,
     multiple=True,
 )
 @click.option("-p", "--filepath", help="The path to write the generated offer file to", required=True)
         @@@ -454,6 -454,6 +453,7 @@@
     is_flag=True,
     default=False,
 )
+@click.option("-o", "--override", help="Creates offer without checking for unusual values", is_flag=True, default=False)
 def make_offer_cmd(
     wallet_rpc_port: Optional[int],
     fingerprint: int,
         @@@ -462,9 -462,9 +462,14 @@@
     filepath: str,
     fee: str,
     reuse: bool,
+    override: bool,
 ) -> None:
     from .wallet_funcs import make_offer
+    if len(request) == 0 and not override:
+        print("Cannot make an offer without requesting something without --override")
+        return
     asyncio.run(
         make_offer(
             wallet_rpc_port=wallet_rpc_port,
         @@@ -873,14 -873,14 +878,20 @@@ def did_transfer_did
     id: int,
     target_address: str,
     reset_recovery: bool,
-    fee: int,
+    fee: str,
     reuse: bool,
 ) -> None:
     from .wallet_funcs import transfer_did
     asyncio.run(
         transfer_did(
-            wallet_rpc_port, fingerprint, id, fee, target_address, reset_recovery is False, True if reuse else None
+            wallet_rpc_port,
+            fingerprint,
+            id,
+            Decimal(fee),
+            target_address,
+            reset_recovery is False,
+            True if reuse else None,
         )
     )

chia/cmds/wallet_funcs.py CHANGED Viewed

         @@@ -1004,11 -1004,11 +1004,13 @@@ async def transfer_did
     wallet_rpc_port: Optional[int],
     fp: Optional[int],
     did_wallet_id: int,
-    fee: int,
+    d_fee: Decimal,
     target_address: str,
     with_recovery: bool,
     reuse_puzhash: Optional[bool],
 ) -> None:
+    fee: int = int(d_fee * units["chia"])
     async with get_wallet_client(wallet_rpc_port, fp) as (wallet_client, fingerprint, config):
         try:
             response = await wallet_client.did_transfer_did(

chia/consensus/block_body_validation.py CHANGED Viewed

         @@@ -109,12 -109,12 +109,14 @@@ class ForkInfo
                 self.removals_since_fork[bytes32(spend.coin_id)] = ForkRem(bytes32(spend.puzzle_hash), height)
                 for puzzle_hash, amount, hint in spend.create_coin:
                     coin = Coin(bytes32(spend.coin_id), bytes32(puzzle_hash), uint64(amount))
-                    self.additions_since_fork[coin.name()] = ForkAdd(coin, height, timestamp, hint, False)
+                    self.additions_since_fork[coin.name()] = ForkAdd(
+                        coin, uint32(height), uint64(timestamp), hint, False
+                    )
         for coin in block.get_included_reward_coins():
             assert block.foliage_transaction_block is not None
             timestamp = block.foliage_transaction_block.timestamp
             assert coin.name() not in self.additions_since_fork
-            self.additions_since_fork[coin.name()] = ForkAdd(coin, block.height, timestamp, None, True)
+            self.additions_since_fork[coin.name()] = ForkAdd(coin, uint32(block.height), uint64(timestamp), None, True)
 async def validate_block_body(
         @@@ -391,7 -391,7 +393,7 @@@
                 height,
                 height,
                 False,
-                block.foliage_transaction_block.timestamp,
+                uint64(block.foliage_transaction_block.timestamp),
             )
             removal_coin_records[new_unspent.name] = new_unspent
         else:
         @@@ -490,7 -490,7 +492,7 @@@
         block_timestamp: uint64
         if height < constants.SOFT_FORK2_HEIGHT:
             # this does not happen on mainnet. testnet10 only
-            block_timestamp = block.foliage_transaction_block.timestamp  # pragma: no cover
+            block_timestamp = uint64(block.foliage_transaction_block.timestamp)  # pragma: no cover
         else:
             block_timestamp = prev_transaction_block_timestamp

chia/consensus/block_creation.py CHANGED Viewed

         @@@ -2,7 -2,7 +2,6 @@@ from __future__ import annotation
 import logging
 import random
-from dataclasses import replace
 from typing import Callable, Dict, List, Optional, Sequence, Tuple
 import chia_rs
         @@@ -501,10 -501,10 +500,7 @@@ def unfinished_block_to_full_block
         is_transaction_block,
     )
     if prev_block is None:
-        new_foliage = replace(
-            unfinished_block.foliage,
-            reward_block_hash=reward_chain_block.get_hash(),
-        )
+        new_foliage = unfinished_block.foliage.replace(reward_block_hash=reward_chain_block.get_hash())
     else:
         if is_transaction_block:
             new_fbh = unfinished_block.foliage.foliage_transaction_block_hash
         @@@ -513,8 -513,8 +509,7 @@@
             new_fbh = None
             new_fbs = None
         assert (new_fbh is None) == (new_fbs is None)
-        new_foliage = replace(
-            unfinished_block.foliage,
+        new_foliage = unfinished_block.foliage.replace(
             reward_block_hash=reward_chain_block.get_hash(),
             prev_block_hash=prev_block.header_hash,
             foliage_transaction_block_hash=new_fbh,

chia/consensus/block_header_validation.py CHANGED Viewed

         @@@ -1,6 -1,6 +1,5 @@@
 from __future__ import annotations
-import dataclasses
 import logging
 import time
 from typing import Optional, Tuple
         @@@ -67,7 -67,7 +66,7 @@@ def validate_unfinished_header_block
     if genesis_block and header_block.prev_header_hash != constants.GENESIS_CHALLENGE:
         return None, ValidationError(Err.INVALID_PREV_BLOCK_HASH)
-    overflow = is_overflow_block(constants, header_block.reward_chain_block.signage_point_index)
+    overflow = is_overflow_block(constants, uint8(header_block.reward_chain_block.signage_point_index))
     if skip_overflow_last_ss_validation and overflow:
         if final_eos_is_already_included(header_block, blocks, expected_sub_slot_iters):
             skip_overflow_last_ss_validation = False
         @@@ -194,9 -194,9 +193,9 @@@
                         icc_iters_proof,
                         sub_slot.infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf.output,
                     )
-                    if sub_slot.infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf != dataclasses.replace(
-                        target_vdf_info,
-                        number_of_iterations=icc_iters_committed,
+                    if (
+                        sub_slot.infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf
+                        != target_vdf_info.replace(number_of_iterations=icc_iters_committed)
                     ):
                         return None, ValidationError(Err.INVALID_ICC_EOS_VDF)
                     if not skip_vdf_is_valid:
         @@@ -338,9 -338,9 +337,8 @@@
                 else:
                     cc_eos_vdf_info_iters = expected_sub_slot_iters
             # Check that the modified data is correct
-            if sub_slot.challenge_chain.challenge_chain_end_of_slot_vdf != dataclasses.replace(
-                partial_cc_vdf_info,
-                number_of_iterations=cc_eos_vdf_info_iters,
+            if sub_slot.challenge_chain.challenge_chain_end_of_slot_vdf != partial_cc_vdf_info.replace(
+                number_of_iterations=cc_eos_vdf_info_iters
             ):
                 return None, ValidationError(Err.INVALID_CC_EOS_VDF, "wrong challenge chain end of slot vdf")
         @@@ -526,13 -526,13 +524,13 @@@
     sp_iters: uint64 = calculate_sp_iters(
         constants,
         expected_sub_slot_iters,
-        header_block.reward_chain_block.signage_point_index,
+        uint8(header_block.reward_chain_block.signage_point_index),
     )
     ip_iters: uint64 = calculate_ip_iters(
         constants,
         expected_sub_slot_iters,
-        header_block.reward_chain_block.signage_point_index,
+        uint8(header_block.reward_chain_block.signage_point_index),
         required_iters,
     )
     if header_block.reward_chain_block.challenge_chain_sp_vdf is None:
         @@@ -659,9 -659,9 +657,8 @@@
             header_block.reward_chain_block.challenge_chain_sp_vdf.output,
         )
-        if header_block.reward_chain_block.challenge_chain_sp_vdf != dataclasses.replace(
-            target_vdf_info,
-            number_of_iterations=sp_iters,
+        if header_block.reward_chain_block.challenge_chain_sp_vdf != target_vdf_info.replace(
+            number_of_iterations=sp_iters
         ):
             return None, ValidationError(Err.INVALID_CC_SP_VDF)
         if not skip_vdf_is_valid:
         @@@ -879,7 -879,7 +876,7 @@@ def validate_finished_header_block
     ip_iters: uint64 = calculate_ip_iters(
         constants,
         expected_sub_slot_iters,
-        header_block.reward_chain_block.signage_point_index,
+        uint8(header_block.reward_chain_block.signage_point_index),
         required_iters,
     )
     if not genesis_block:
         @@@ -944,14 -944,14 +941,10 @@@
         ip_vdf_iters,
         header_block.reward_chain_block.challenge_chain_ip_vdf.output,
     )
-    if header_block.reward_chain_block.challenge_chain_ip_vdf != dataclasses.replace(
-        cc_target_vdf_info,
-        number_of_iterations=ip_iters,
+    if header_block.reward_chain_block.challenge_chain_ip_vdf != cc_target_vdf_info.replace(
+        number_of_iterations=ip_iters
     ):
-        expected = dataclasses.replace(
-            cc_target_vdf_info,
-            number_of_iterations=ip_iters,
-        )
+        expected = cc_target_vdf_info.replace(number_of_iterations=ip_iters)
         log.error(f"{header_block.reward_chain_block.challenge_chain_ip_vdf }. expected {expected}")
         log.error(f"Block: {header_block}")
         return None, ValidationError(Err.INVALID_CC_IP_VDF)
         @@@ -990,7 -990,7 +983,7 @@@
     # 31. Check infused challenge chain infusion point VDF
     if not genesis_block:
-        overflow = is_overflow_block(constants, header_block.reward_chain_block.signage_point_index)
+        overflow = is_overflow_block(constants, uint8(header_block.reward_chain_block.signage_point_index))
         deficit = calculate_deficit(
             constants,
             header_block.height,

chia/consensus/full_block_to_block_record.py CHANGED Viewed

         @@@ -39,7 -39,7 +39,7 @@@ def block_to_block_record
         sub_slot_iters, _ = get_next_sub_slot_iters_and_difficulty(
             constants, len(block.finished_sub_slots) > 0, prev_b, blocks
         )
-    overflow = is_overflow_block(constants, block.reward_chain_block.signage_point_index)
+    overflow = is_overflow_block(constants, uint8(block.reward_chain_block.signage_point_index))
     deficit = calculate_deficit(
         constants,
         block.height,
         @@@ -62,8 -62,8 +62,8 @@@
             blocks,
             block.height,
             blocks.block_record(prev_b.prev_hash),
-            block.finished_sub_slots[0].challenge_chain.new_difficulty,
-            block.finished_sub_slots[0].challenge_chain.new_sub_slot_iters,
+            uint64.construct_optional(block.finished_sub_slots[0].challenge_chain.new_difficulty),
+            uint64.construct_optional(block.finished_sub_slots[0].challenge_chain.new_sub_slot_iters),
         )
         if ses.get_hash() != found_ses_hash:
             raise ValueError(Err.INVALID_SUB_EPOCH_SUMMARY)
         @@@ -148,7 -148,7 +148,7 @@@ def header_block_to_sub_block_record
         block.height,
         block.weight,
         block.total_iters,
-        block.reward_chain_block.signage_point_index,
+        uint8(block.reward_chain_block.signage_point_index),
         block.reward_chain_block.challenge_chain_ip_vdf.output,
         icc_output,
         block.reward_chain_block.get_hash(),
         @@@ -160,9 -160,9 +160,9 @@@
         deficit,
         overflow,
         prev_transaction_block_height,
-        timestamp,
+        uint64.construct_optional(timestamp),
         prev_transaction_block_hash,
-        fees,
+        uint64.construct_optional(fees),
         reward_claims_incorporated,
         finished_challenge_slot_hashes,
         finished_infused_challenge_slot_hashes,

chia/consensus/make_sub_epoch_summary.py CHANGED Viewed

         @@@ -94,7 -94,7 +94,7 @@@ def next_sub_epoch_summary
     Returns:
         object: the new sub-epoch summary
     """
-    signage_point_index = block.reward_chain_block.signage_point_index
+    signage_point_index = uint8(block.reward_chain_block.signage_point_index)
     prev_b: Optional[BlockRecord] = blocks.try_block_record(block.prev_header_hash)
     if prev_b is None or prev_b.height == 0:
         return None

chia/consensus/multiprocess_validation.py CHANGED Viewed

         @@@ -32,7 -32,7 +32,7 @@@ from chia.util.block_cache import Block
 from chia.util.condition_tools import pkm_pairs
 from chia.util.errors import Err, ValidationError
 from chia.util.generator_tools import get_block_header, tx_removals_and_additions
-from chia.util.ints import uint16, uint32, uint64
+from chia.util.ints import uint8, uint16, uint32, uint64
 from chia.util.streamable import Streamable, streamable
 log = logging.getLogger(__name__)
         @@@ -257,7 -257,7 +257,7 @@@ async def pre_validate_blocks_multiproc
             constants, len(block.finished_sub_slots) > 0, prev_b, block_records
         )
-        overflow = is_overflow_block(constants, block.reward_chain_block.signage_point_index)
+        overflow = is_overflow_block(constants, uint8(block.reward_chain_block.signage_point_index))
         challenge = get_block_challenge(constants, block, BlockCache(recent_blocks), prev_b is None, overflow, False)
         if block.reward_chain_block.challenge_chain_sp_vdf is None:
             cc_sp_hash: bytes32 = challenge

chia/daemon/server.py CHANGED Viewed

         @@@ -31,7 -31,7 +31,6 @@@ from chia.plotters.plotters import get_
 from chia.plotting.util import add_plot_directory
 from chia.server.server import ssl_context_for_server
 from chia.util.bech32m import encode_puzzle_hash
-from chia.util.beta_metrics import BetaMetricsLogger
 from chia.util.chia_logging import initialize_service_logging
 from chia.util.config import load_config
 from chia.util.errors import KeychainCurrentPassphraseIsInvalid
         @@@ -1534,8 -1534,8 +1533,10 @@@ async def async_run_daemon(root_path: P
         with Lockfile.create(daemon_launch_lock_path(root_path), timeout=1):
             log.info(f"chia-blockchain version: {chia_full_version_str()}")
-            beta_metrics: Optional[BetaMetricsLogger] = None
+            beta_metrics = None
             if config.get("beta", {}).get("enabled", False):
+                from chia.util.beta_metrics import BetaMetricsLogger
                 beta_metrics = BetaMetricsLogger(root_path)
                 beta_metrics.start_logging()

chia/data_layer/data_layer_util.py CHANGED Viewed

         @@@ -43,6 -43,6 +43,10 @@@ def leaf_hash(key: bytes, value: bytes
     return Program.to((key, value)).get_tree_hash()  # type: ignore[no-any-return]
+def key_hash(key: bytes) -> bytes32:
+    return Program.to(key).get_tree_hash()  # type: ignore[no-any-return]
 async def _debug_dump(db: DBWrapper2, description: str = "") -> None:
     async with db.reader() as reader:
         cursor = await reader.execute("SELECT name FROM sqlite_master WHERE type='table';")

chia/data_layer/data_store.py CHANGED Viewed

         @@@ -28,6 -28,6 +28,7 @@@ from chia.data_layer.data_layer_util im
     Subscription,
     TerminalNode,
     internal_hash,
+    key_hash,
     leaf_hash,
     row_to_node,
 )
         @@@ -672,35 -672,35 +673,40 @@@ class DataStore
         return internal_nodes
+    async def get_keys_values_cursor(
+        self, reader: aiosqlite.Connection, root_hash: Optional[bytes32]
+    ) -> aiosqlite.Cursor:
+        return await reader.execute(
+            """
+            WITH RECURSIVE
+                tree_from_root_hash(hash, node_type, left, right, key, value, depth, rights) AS (
+                    SELECT node.*, 0 AS depth, 0 AS rights FROM node WHERE node.hash == :root_hash
+                    UNION ALL
+                    SELECT
+                        node.*,
+                        tree_from_root_hash.depth + 1 AS depth,
+                        CASE
+                            WHEN node.hash == tree_from_root_hash.right
+                            THEN tree_from_root_hash.rights + (1 << (62 - tree_from_root_hash.depth))
+                            ELSE tree_from_root_hash.rights
+                            END AS rights
+                        FROM node, tree_from_root_hash
+                    WHERE node.hash == tree_from_root_hash.left OR node.hash == tree_from_root_hash.right
+                )
+            SELECT * FROM tree_from_root_hash
+            WHERE node_type == :node_type
+            ORDER BY depth ASC, rights ASC
+            """,
+            {"root_hash": root_hash, "node_type": NodeType.TERMINAL},
+        )
     async def get_keys_values(self, tree_id: bytes32, root_hash: Optional[bytes32] = None) -> List[TerminalNode]:
         async with self.db_wrapper.reader() as reader:
             if root_hash is None:
                 root = await self.get_tree_root(tree_id=tree_id)
                 root_hash = root.node_hash
-            cursor = await reader.execute(
-                """
-                WITH RECURSIVE
-                    tree_from_root_hash(hash, node_type, left, right, key, value, depth, rights) AS (
-                        SELECT node.*, 0 AS depth, 0 AS rights FROM node WHERE node.hash == :root_hash
-                        UNION ALL
-                        SELECT
-                            node.*,
-                            tree_from_root_hash.depth + 1 AS depth,
-                            CASE
-                                WHEN node.hash == tree_from_root_hash.right
-                                THEN tree_from_root_hash.rights + (1 << (62 - tree_from_root_hash.depth))
-                                ELSE tree_from_root_hash.rights
-                                END AS rights
-                            FROM node, tree_from_root_hash
-                        WHERE node.hash == tree_from_root_hash.left OR node.hash == tree_from_root_hash.right
-                    )
-                SELECT * FROM tree_from_root_hash
-                WHERE node_type == :node_type
-                ORDER BY depth ASC, rights ASC
-                """,
-                {"root_hash": None if root_hash is None else root_hash, "node_type": NodeType.TERMINAL},
-            )
+            cursor = await self.get_keys_values_cursor(reader, root_hash)
             terminal_nodes: List[TerminalNode] = []
             async for row in cursor:
                 if row["depth"] > 62:
         @@@ -722,6 -722,6 +728,26 @@@
         return terminal_nodes
+    async def get_keys_values_compressed(
+        self, tree_id: bytes32, root_hash: Optional[bytes32] = None
+    ) -> Dict[bytes32, bytes32]:
+        async with self.db_wrapper.reader() as reader:
+            if root_hash is None:
+                root = await self.get_tree_root(tree_id=tree_id)
+                root_hash = root.node_hash
+            cursor = await self.get_keys_values_cursor(reader, root_hash)
+            kv_compressed: Dict[bytes32, bytes32] = {}
+            async for row in cursor:
+                if row["depth"] > 62:
+                    raise Exception("Tree depth exceeded 62, unable to guarantee left-to-right node order.")
+                node = row_to_node(row=row)
+                if not isinstance(node, TerminalNode):
+                    raise Exception(f"Unexpected internal node found: {node.hash.hex()}")
+                kv_compressed[key_hash(node.key)] = leaf_hash(node.key, node.value)
+            return kv_compressed
     async def get_node_type(self, node_hash: bytes32) -> NodeType:
         async with self.db_wrapper.reader() as reader:
             cursor = await reader.execute(
         @@@ -795,7 -795,7 +821,7 @@@
         key: bytes,
         value: bytes,
         tree_id: bytes32,
-        hint_keys_values: Optional[Dict[bytes, bytes]] = None,
+        hint_keys_values: Optional[Dict[bytes32, bytes32]] = None,
         use_optimized: bool = True,
         status: Status = Status.PENDING,
         root: Optional[Root] = None,
         @@@ -941,7 -941,7 +967,7 @@@
         tree_id: bytes32,
         reference_node_hash: Optional[bytes32],
         side: Optional[Side],
-        hint_keys_values: Optional[Dict[bytes, bytes]] = None,
+        hint_keys_values: Optional[Dict[bytes32, bytes32]] = None,
         use_optimized: bool = True,
         status: Status = Status.PENDING,
         root: Optional[Root] = None,
         @@@ -959,7 -959,7 +985,7 @@@
                     if any(key == node.key for node in pairs):
                         raise Exception(f"Key already present: {key.hex()}")
                 else:
-                    if key in hint_keys_values:
+                    if key_hash(key) in hint_keys_values:
                         raise Exception(f"Key already present: {key.hex()}")
             if reference_node_hash is None:
         @@@ -1015,14 -1015,14 +1041,14 @@@
                 )
             if hint_keys_values is not None:
-                hint_keys_values[key] = value
+                hint_keys_values[key_hash(key)] = leaf_hash(key, value)
             return InsertResult(node_hash=new_terminal_node_hash, root=new_root)
     async def delete(
         self,
         key: bytes,
         tree_id: bytes32,
-        hint_keys_values: Optional[Dict[bytes, bytes]] = None,
+        hint_keys_values: Optional[Dict[bytes32, bytes32]] = None,
         use_optimized: bool = True,
         status: Status = Status.PENDING,
         root: Optional[Root] = None,
         @@@ -1031,17 -1031,17 +1057,17 @@@
         async with self.db_wrapper.writer():
             if hint_keys_values is None:
                 node = await self.get_node_by_key(key=key, tree_id=tree_id)
+                node_hash = node.hash
+                assert isinstance(node, TerminalNode)
             else:
-                if key not in hint_keys_values:
+                if key_hash(key) not in hint_keys_values:
                     log.debug(f"Request to delete an unknown key ignored: {key.hex()}")
                     return root
-                value = hint_keys_values[key]
-                node_hash = leaf_hash(key=key, value=value)
-                node = TerminalNode(node_hash, key, value)
-                del hint_keys_values[key]
+                node_hash = hint_keys_values[key_hash(key)]
+                del hint_keys_values[key_hash(key)]
             ancestors: List[InternalNode] = await self.get_ancestors_common(
-                node_hash=node.hash,
+                node_hash=node_hash,
                 tree_id=tree_id,
                 root_hash=root_hash,
                 use_optimized=use_optimized,
         @@@ -1056,7 -1056,7 +1082,7 @@@
                 )
             parent = ancestors[0]
-            other_hash = parent.other_child_hash(hash=node.hash)
+            other_hash = parent.other_child_hash(hash=node_hash)
             if len(ancestors) == 1:
                 # the parent is the root so the other side will become the new root
         @@@ -1106,7 -1106,7 +1132,7 @@@
         key: bytes,
         new_value: bytes,
         tree_id: bytes32,
-        hint_keys_values: Optional[Dict[bytes, bytes]] = None,
+        hint_keys_values: Optional[Dict[bytes32, bytes32]] = None,
         use_optimized: bool = True,
         status: Status = Status.PENDING,
         root: Optional[Root] = None,
         @@@ -1134,7 -1134,7 +1160,7 @@@
                     return InsertResult(leaf_hash(key, new_value), root)
                 old_node_hash = old_node.hash
             else:
-                if key not in hint_keys_values:
+                if key_hash(key) not in hint_keys_values:
                     log.debug(f"Key not found: {key.hex()}. Doing an autoinsert instead")
                     return await self.autoinsert(
                         key=key,
         @@@ -1145,12 -1145,12 +1171,15 @@@
                         status=status,
                         root=root,
                     )
-                value = hint_keys_values[key]
+                node_hash = hint_keys_values[key_hash(key)]
+                node = await self.get_node(node_hash)
+                assert isinstance(node, TerminalNode)
+                value = node.value
                 if value == new_value:
                     log.debug(f"New value matches old value in upsert operation: {key.hex()}")
                     return InsertResult(leaf_hash(key, new_value), root)
                 old_node_hash = leaf_hash(key=key, value=value)
-                del hint_keys_values[key]
+                del hint_keys_values[key_hash(key)]
             # create new terminal node
             new_terminal_node_hash = await self._insert_terminal_node(key=key, value=new_value)
         @@@ -1192,7 -1192,7 +1221,7 @@@
                 )
             if hint_keys_values is not None:
-                hint_keys_values[key] = new_value
+                hint_keys_values[key_hash(key)] = leaf_hash(key, new_value)
             return InsertResult(node_hash=new_terminal_node_hash, root=new_root)
     async def clean_node_table(self, writer: aiosqlite.Connection) -> None:
         @@@ -1229,7 -1229,7 +1258,7 @@@
             if old_root.node_hash is None:
                 hint_keys_values = {}
             else:
-                hint_keys_values = await self.get_keys_values_dict(tree_id, root_hash=root_hash)
+                hint_keys_values = await self.get_keys_values_compressed(tree_id, root_hash=root_hash)
             intermediate_root: Optional[Root] = old_root
             for change in changelist:

chia/data_layer/util/benchmark.py CHANGED Viewed

         @@@ -23,7 -23,7 +23,7 @@@ async def generate_datastore(num_nodes
             os.remove(db_path)
         async with DataStore.managed(database=db_path) as data_store:
-            hint_keys_values: Dict[bytes, bytes] = {}
+            hint_keys_values: Dict[bytes32, bytes32] = {}
             tree_id = bytes32(b"0" * 32)
             await data_store.create_tree(tree_id)

chia/full_node/full_node.py CHANGED Viewed

         @@@ -94,7 -94,7 +94,7 @@@ from chia.util.ints import uint8, uint3
 from chia.util.limited_semaphore import LimitedSemaphore
 from chia.util.log_exceptions import log_exceptions
 from chia.util.path import path_from_root
-from chia.util.profiler import mem_profile_task, profile_task
+from chia.util.profiler import enable_profiler, mem_profile_task, profile_task
 from chia.util.safe_cancel_task import cancel_task_safe
         @@@ -232,7 -232,7 +232,7 @@@ class FullNode
         async with DBWrapper2.managed(
             self.db_path,
             db_version=db_version,
-            reader_count=4,
+            reader_count=self.config.get("db_readers", 4),
             log_path=sql_log_path,
             synchronous=db_sync,
         ) as self._db_wrapper:
         @@@ -288,6 -288,6 +288,13 @@@
             if self.config.get("enable_profiler", False):
                 asyncio.create_task(profile_task(self.root_path, "node", self.log))
+            self.profile_block_validation = self.config.get("profile_block_validation", False)
+            if self.profile_block_validation:  # pragma: no cover
+                # this is not covered by any unit tests as it's essentially test code
+                # itself. It's exercised manually when investigating performance issues
+                profile_dir = path_from_root(self.root_path, "block-validation-profile")
+                profile_dir.mkdir(parents=True, exist_ok=True)
             if self.config.get("enable_memory_profiler", False):
                 asyncio.create_task(mem_profile_task(self.root_path, "node", self.log))
         @@@ -466,7 -466,7 +473,7 @@@
         peer = entry.peer
         try:
             inc_status, err = await self.add_transaction(entry.transaction, entry.spend_name, peer, entry.test)
-            entry.done.set_result((inc_status, err))
+            entry.done.set((inc_status, err))
         except asyncio.CancelledError:
             error_stack = traceback.format_exc()
             self.log.debug(f"Cancelling _handle_one_transaction, closing: {error_stack}")
         @@@ -1147,7 -1147,7 +1154,7 @@@
                     hints_to_add, _ = get_hints_and_subscription_coin_ids(
                         state_change_summary,
                         self.subscriptions.has_coin_subscription,
-                        self.subscriptions.has_ph_subscription,
+                        self.subscriptions.has_puzzle_subscription,
                     )
                     await self.hint_store.add_hints(hints_to_add)
                 # Note that end_height is not necessarily the peak at this
         @@@ -1387,8 -1387,8 +1394,8 @@@
         self.log.info(
             f"ΓÅ▓∩╕Å  Finished signage point {request.index_from_challenge}/"
             f"{self.constants.NUM_SPS_SUB_SLOT}: "
-            f"CC: {request.challenge_chain_vdf.output.get_hash()} "
-            f"RC: {request.reward_chain_vdf.output.get_hash()} "
+            f"CC: {request.challenge_chain_vdf.output.get_hash().hex()} "
+            f"RC: {request.reward_chain_vdf.output.get_hash().hex()} "
         )
         self.signage_point_times[request.index_from_challenge] = time.time()
         sub_slot_tuple = self.full_node_store.get_sub_slot(request.challenge_chain_vdf.challenge)
         @@@ -1456,7 -1456,7 +1463,7 @@@
         self.log.info(
             f"≡ƒî▒ Updated peak to height {record.height}, weight {record.weight}, "
             f"hh {record.header_hash}, "
-            f"forked at {state_change_summary.fork_height}, rh: {record.reward_infusion_new_challenge}, "
+            f"forked at {state_change_summary.fork_height}, rh: {record.reward_infusion_new_challenge.hex()}, "
             f"total iters: {record.total_iters}, "
             f"overflow: {record.overflow}, "
             f"deficit: {record.deficit}, "
         @@@ -1477,7 -1477,7 +1484,7 @@@
         hints_to_add, lookup_coin_ids = get_hints_and_subscription_coin_ids(
             state_change_summary,
             self.subscriptions.has_coin_subscription,
-            self.subscriptions.has_ph_subscription,
+            self.subscriptions.has_puzzle_subscription,
         )
         await self.hint_store.add_hints(hints_to_add)
         @@@ -1591,7 -1591,7 +1598,6 @@@
         if record.height % 1000 == 0:
             # Occasionally clear data in full node store to keep memory usage small
-            self.full_node_store.clear_seen_unfinished_blocks()
             self.full_node_store.clear_old_cache_entries()
         if self.sync_store.get_sync_mode() is False:
         @@@ -1706,7 -1706,7 +1712,9 @@@
                 return await self.add_block(new_block, peer)
         state_change_summary: Optional[StateChangeSummary] = None
         ppp_result: Optional[PeakPostProcessingResult] = None
-        async with self.blockchain.priority_mutex.acquire(priority=BlockchainMutexPriority.high):
+        async with self.blockchain.priority_mutex.acquire(priority=BlockchainMutexPriority.high), enable_profiler(
+            self.profile_block_validation
+        ) as pr:
             # After acquiring the lock, check again, because another asyncio thread might have added it
             if self.blockchain.contains_block(header_hash):
                 return None
         @@@ -1800,9 -1800,9 +1808,16 @@@
             f"pre_validation time: {pre_validation_time:0.2f} seconds, "
             f"post-process time: {post_process_time:0.2f} seconds, "
             f"cost: {block.transactions_info.cost if block.transactions_info is not None else 'None'}"
-            f"{percent_full_str} header_hash: {header_hash} height: {block.height}",
+            f"{percent_full_str} header_hash: {header_hash.hex()} height: {block.height}",
         )
+        # this is not covered by any unit tests as it's essentially test code
+        # itself. It's exercised manually when investigating performance issues
+        if validation_time > 2 and pr is not None:  # pragma: no cover
+            pr.create_stats()
+            profile_dir = path_from_root(self.root_path, "block-validation-profile")
+            pr.dump_stats(profile_dir / f"{block.height}-{validation_time:0.1f}.profile")
         # This code path is reached if added == ADDED_AS_ORPHAN or NEW_TIP
         peak = self.blockchain.get_peak()
         assert peak is not None
         @@@ -1816,11 -1816,11 +1831,17 @@@
             "transaction_block": False,
             "k_size": block.reward_chain_block.proof_of_space.size,
             "header_hash": block.header_hash,
+            "fork_height": None,
+            "rolled_back_records": None,
             "height": block.height,
             "validation_time": validation_time,
             "pre_validation_time": pre_validation_time,
         }
+        if state_change_summary is not None:
+            state_changed_data["fork_height"] = state_change_summary.fork_height
+            state_changed_data["rolled_back_records"] = len(state_change_summary.rolled_back_records)
         if block.transactions_info is not None:
             state_changed_data["transaction_block"] = True
             state_changed_data["block_cost"] = block.transactions_info.cost
         @@@ -1872,7 -1872,7 +1893,7 @@@
         if self.full_node_store.seen_unfinished_block(block.get_hash()):
             return None
-        block_hash = block.reward_chain_block.get_hash()
+        block_hash = bytes32(block.reward_chain_block.get_hash())
         # This searched for the trunk hash (unfinished reward hash). If we have already added a block with the same
         # hash, return
         @@@ -1954,10 -1954,10 +1975,6 @@@
             validation_start = time.monotonic()
             validate_result = await self.blockchain.validate_unfinished_block(block, npc_result)
             if validate_result.error is not None:
-                if validate_result.error == Err.COIN_AMOUNT_NEGATIVE.value:
-                    # TODO: remove in the future, hotfix for 1.1.5 peers to not disconnect older peers
-                    self.log.info(f"Consensus error {validate_result.error}, not disconnecting")
-                    return
                 raise ConsensusError(Err(validate_result.error))
             validation_time = time.monotonic() - validation_start
         @@@ -2097,7 -2097,7 +2114,9 @@@
             # If not found, cache keyed on prev block
             if prev_b is None:
                 self.full_node_store.add_to_future_ip(request)
-                self.log.warning(f"Previous block is None, infusion point {request.reward_chain_ip_vdf.challenge}")
+                self.log.warning(
+                    f"Previous block is None, infusion point {request.reward_chain_ip_vdf.challenge.hex()}"
+                )
                 return None
         finished_sub_slots: Optional[List[EndOfSubSlotBundle]] = self.full_node_store.get_finished_sub_slots(
         @@@ -2128,7 -2128,7 +2147,7 @@@
             + calculate_sp_iters(
                 self.constants,
                 sub_slot_iters,
-                unfinished_block.reward_chain_block.signage_point_index,
+                uint8(unfinished_block.reward_chain_block.signage_point_index),
             )
         )
         @@@ -2210,9 -2210,9 +2229,9 @@@
             if new_infusions is not None:
                 self.log.info(
                     f"ΓÅ▓∩╕Å  Finished sub slot, SP {self.constants.NUM_SPS_SUB_SLOT}/{self.constants.NUM_SPS_SUB_SLOT}, "
-                    f"{end_of_slot_bundle.challenge_chain.get_hash()}, "
+                    f"{end_of_slot_bundle.challenge_chain.get_hash().hex()}, "
                     f"number of sub-slots: {len(self.full_node_store.finished_sub_slots)}, "
-                    f"RC hash: {end_of_slot_bundle.reward_chain.get_hash()}, "
+                    f"RC hash: {end_of_slot_bundle.reward_chain.get_hash().hex()}, "
                     f"Deficit {end_of_slot_bundle.reward_chain.deficit}"
                 )
                 # Reset farmer response timer for sub slot (SP 0)
         @@@ -2246,7 -2246,7 +2265,7 @@@
             else:
                 self.log.info(
                     f"End of slot not added CC challenge "
-                    f"{end_of_slot_bundle.challenge_chain.challenge_chain_end_of_slot_vdf.challenge}"
+                    f"{end_of_slot_bundle.challenge_chain.challenge_chain_end_of_slot_vdf.challenge.hex()}"
                 )
         return None, False
         @@@ -2425,8 -2425,8 +2444,8 @@@
         if field_vdf == CompressibleVDFField.CC_EOS_VDF:
             for index, sub_slot in enumerate(block.finished_sub_slots):
                 if sub_slot.challenge_chain.challenge_chain_end_of_slot_vdf == vdf_info:
-                    new_proofs = dataclasses.replace(sub_slot.proofs, challenge_chain_slot_proof=vdf_proof)
-                    new_subslot = dataclasses.replace(sub_slot, proofs=new_proofs)
+                    new_proofs = sub_slot.proofs.replace(challenge_chain_slot_proof=vdf_proof)
+                    new_subslot = sub_slot.replace(proofs=new_proofs)
                     new_finished_subslots = block.finished_sub_slots
                     new_finished_subslots[index] = new_subslot
                     new_block = dataclasses.replace(block, finished_sub_slots=new_finished_subslots)
         @@@ -2437,8 -2437,8 +2456,8 @@@
                     sub_slot.infused_challenge_chain is not None
                     and sub_slot.infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf == vdf_info
                 ):
-                    new_proofs = dataclasses.replace(sub_slot.proofs, infused_challenge_chain_slot_proof=vdf_proof)
-                    new_subslot = dataclasses.replace(sub_slot, proofs=new_proofs)
+                    new_proofs = sub_slot.proofs.replace(infused_challenge_chain_slot_proof=vdf_proof)
+                    new_subslot = sub_slot.replace(proofs=new_proofs)
                     new_finished_subslots = block.finished_sub_slots
                     new_finished_subslots[index] = new_subslot
                     new_block = dataclasses.replace(block, finished_sub_slots=new_finished_subslots)

chia/full_node/full_node_api.py CHANGED Viewed

         @@@ -576,7 -576,7 +576,7 @@@ class FullNodeAPI
         else:
             if self.full_node.full_node_store.get_sub_slot(request.challenge_hash) is None:
                 if request.challenge_hash != self.full_node.constants.GENESIS_CHALLENGE:
-                    self.log.info(f"Don't have challenge hash {request.challenge_hash}")
+                    self.log.info(f"Don't have challenge hash {request.challenge_hash.hex()}")
             sp: Optional[SignagePoint] = self.full_node.full_node_store.get_signage_point_by_index(
                 request.challenge_hash,
         @@@ -651,7 -651,7 +651,8 @@@
             else:
                 self.log.debug(
                     f"Signage point {request.index_from_challenge} not added, CC challenge: "
-                    f"{request.challenge_chain_vdf.challenge}, RC challenge: {request.reward_chain_vdf.challenge}"
+                    f"{request.challenge_chain_vdf.challenge.hex()}, "
+                    f"RC challenge: {request.reward_chain_vdf.challenge.hex()}"
                 )
             return None
         @@@ -706,7 -706,7 +707,7 @@@
                 if sp_vdfs.rc_vdf.output.get_hash() != request.reward_chain_sp:
                     self.log.debug(
                         f"Received proof of space for a potentially old signage point {request.challenge_chain_sp}. "
-                        f"Current sp: {sp_vdfs.rc_vdf.output.get_hash()}"
+                        f"Current sp: {sp_vdfs.rc_vdf.output.get_hash().hex()}"
                     )
                     return None
         @@@ -879,9 -879,9 +880,9 @@@
                 sub_slot_iters = peak.sub_slot_iters
                 for sub_slot in finished_sub_slots:
                     if sub_slot.challenge_chain.new_difficulty is not None:
-                        difficulty = sub_slot.challenge_chain.new_difficulty
+                        difficulty = uint64(sub_slot.challenge_chain.new_difficulty)
                     if sub_slot.challenge_chain.new_sub_slot_iters is not None:
-                        sub_slot_iters = sub_slot.challenge_chain.new_sub_slot_iters
+                        sub_slot_iters = uint64(sub_slot.challenge_chain.new_sub_slot_iters)
             required_iters: uint64 = calculate_iterations_quality(
                 self.full_node.constants.DIFFICULTY_CONSTANT_FACTOR,
         @@@ -1012,14 -1012,14 +1013,9 @@@
             self.log.warning("Signature not valid. There might be a collision in plots. Ignore this during tests.")
             return None
-        fsb2 = dataclasses.replace(
-            candidate.foliage,
-            foliage_block_data_signature=farmer_request.foliage_block_data_signature,
-        )
+        fsb2 = candidate.foliage.replace(foliage_block_data_signature=farmer_request.foliage_block_data_signature)
         if candidate.is_transaction_block():
-            fsb2 = dataclasses.replace(
-                fsb2, foliage_transaction_block_signature=farmer_request.foliage_transaction_block_signature
-            )
+            fsb2 = fsb2.replace(foliage_transaction_block_signature=farmer_request.foliage_transaction_block_signature)
         new_candidate = dataclasses.replace(candidate, foliage=fsb2)
         if not self.full_node.has_valid_pool_sig(new_candidate):
         @@@ -1093,7 -1093,7 +1089,7 @@@
         if not added:
             self.log.error(
                 f"Was not able to add end of sub-slot: "
-                f"{request.end_of_sub_slot_bundle.challenge_chain.challenge_chain_end_of_slot_vdf.challenge}. "
+                f"{request.end_of_sub_slot_bundle.challenge_chain.challenge_chain_end_of_slot_vdf.challenge.hex()}. "
                 f"Re-sending new-peak to timelord"
             )
             await self.full_node.send_peak_to_timelords(peer=peer)
         @@@ -1276,7 -1276,7 +1272,7 @@@
         await self.full_node.transaction_queue.put(queue_entry, peer_id=None, high_priority=True)
         try:
             with anyio.fail_after(delay=45):
-                status, error = await queue_entry.done
+                status, error = await queue_entry.done.wait()
         except TimeoutError:
             response = wallet_protocol.TransactionAck(spend_name, uint8(MempoolInclusionStatus.PENDING), None)
         else:
         @@@ -1496,7 -1496,7 +1492,7 @@@
         # the returned puzzle hashes are the ones we ended up subscribing to.
         # It will have filtered duplicates and ones exceeding the subscription
         # limit.
-        puzzle_hashes = self.full_node.subscriptions.add_ph_subscriptions(
+        puzzle_hashes = self.full_node.subscriptions.add_puzzle_subscriptions(
             peer.peer_node_id, request.puzzle_hashes, max_subscriptions
         )

chia/full_node/full_node_store.py CHANGED Viewed

         @@@ -45,8 -45,8 +45,11 @@@ class FullNodeStore
     candidate_blocks: Dict[bytes32, Tuple[uint32, UnfinishedBlock]]
     candidate_backup_blocks: Dict[bytes32, Tuple[uint32, UnfinishedBlock]]
-    # Header hashes of unfinished blocks that we have seen recently
-    seen_unfinished_blocks: Set[bytes32]
+    # Block hashes of unfinished blocks that we have seen recently. This is
+    # effectively a Set[bytes32] but in order to evict the oldest items first,
+    # we use a Dict that preserves insertion order, and remove from the
+    # beginning
+    seen_unfinished_blocks: Dict[bytes32, None]
     # Unfinished blocks, keyed from reward hash
     unfinished_blocks: Dict[bytes32, Tuple[uint32, UnfinishedBlock, PreValidationResult]]
         @@@ -86,10 -86,10 +89,12 @@@
     serialized_wp_message: Optional[Message]
     serialized_wp_message_tip: Optional[bytes32]
+    max_seen_unfinished_blocks: int
     def __init__(self, constants: ConsensusConstants):
         self.candidate_blocks = {}
         self.candidate_backup_blocks = {}
-        self.seen_unfinished_blocks = set()
+        self.seen_unfinished_blocks = {}
         self.unfinished_blocks = {}
         self.finished_sub_slots = []
         self.future_eos_cache = {}
         @@@ -108,6 -108,6 +113,7 @@@
         self.tx_fetch_tasks = {}
         self.serialized_wp_message = None
         self.serialized_wp_message_tip = None
+        self.max_seen_unfinished_blocks = 1000
     def add_candidate_block(
         self, quality_string: bytes32, height: uint32, unfinished_block: UnfinishedBlock, backup: bool = False
         @@@ -148,12 -148,12 +154,13 @@@
     def seen_unfinished_block(self, object_hash: bytes32) -> bool:
         if object_hash in self.seen_unfinished_blocks:
             return True
-        self.seen_unfinished_blocks.add(object_hash)
+        self.seen_unfinished_blocks[object_hash] = None
+        if len(self.seen_unfinished_blocks) > self.max_seen_unfinished_blocks:
+            # remove the least recently added hash
+            to_remove = next(iter(self.seen_unfinished_blocks))
+            del self.seen_unfinished_blocks[to_remove]
         return False
-    def clear_seen_unfinished_blocks(self) -> None:
-        self.seen_unfinished_blocks.clear()
     def add_unfinished_block(
         self, height: uint32, unfinished_block: UnfinishedBlock, result: PreValidationResult
     ) -> None:
         @@@ -171,8 -171,8 +178,9 @@@
             return None
         return result[2]
-    def get_unfinished_blocks(self) -> Dict[bytes32, Tuple[uint32, UnfinishedBlock, PreValidationResult]]:
-        return self.unfinished_blocks
+    # returns all unfinished blocks for the specified height
+    def get_unfinished_blocks(self, height: uint32) -> List[UnfinishedBlock]:
+        return [block for ub_height, block, _ in self.unfinished_blocks.values() if ub_height == height]
     def clear_unfinished_blocks_below(self, height: uint32) -> None:
         del_keys: List[bytes32] = []
         @@@ -219,7 -219,7 +227,7 @@@
         self.future_cache_key_times[signage_point.rc_vdf.challenge] = int(time.time())
         self.future_sp_cache[signage_point.rc_vdf.challenge].append((index, signage_point))
-        log.info(f"Don't have rc hash {signage_point.rc_vdf.challenge}. caching signage point {index}.")
+        log.info(f"Don't have rc hash {signage_point.rc_vdf.challenge.hex()}. caching signage point {index}.")
     def get_future_ip(self, rc_challenge_hash: bytes32) -> List[timelord_protocol.NewInfusionPointVDF]:
         return self.future_ip_cache.get(rc_challenge_hash, [])
         @@@ -287,7 -287,7 +295,7 @@@
             # This prevent other peers from appending fake VDFs to our cache
             log.error(
                 f"bad cc_challenge in new_finished_sub_slot, "
-                f"got {eos.challenge_chain.challenge_chain_end_of_slot_vdf.challenge}"
+                f"got {eos.challenge_chain.challenge_chain_end_of_slot_vdf.challenge.hex()}"
                 f"expected {cc_challenge}"
             )
             return None
         @@@ -310,7 -310,7 +318,7 @@@
                 log.debug("dont add slot, total_iters < peak.total_iters")
                 return None
-            rc_challenge = eos.reward_chain.end_of_slot_vdf.challenge
+            rc_challenge = bytes32(eos.reward_chain.end_of_slot_vdf.challenge)
             cc_start_element = peak.challenge_vdf_output
             iters = uint64(total_iters - peak.total_iters)
             if peak.reward_infusion_new_challenge != rc_challenge:
         @@@ -436,9 -436,9 +444,8 @@@
             eos.challenge_chain.challenge_chain_end_of_slot_vdf.output,
         )
         # The EOS will have the whole sub-slot iters, but the proof is only the delta, from the last peak
-        if eos.challenge_chain.challenge_chain_end_of_slot_vdf != dataclasses.replace(
-            partial_cc_vdf_info,
-            number_of_iterations=sub_slot_iters,
+        if eos.challenge_chain.challenge_chain_end_of_slot_vdf != partial_cc_vdf_info.replace(
+            number_of_iterations=sub_slot_iters
         ):
             return None
         if not eos.proofs.challenge_chain_slot_proof.normalized_to_identity and not validate_vdf(
         @@@ -487,9 -487,9 +494,8 @@@
                 eos.infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf.output,
             )
             # The EOS will have the whole sub-slot iters, but the proof is only the delta, from the last peak
-            if eos.infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf != dataclasses.replace(
-                partial_icc_vdf_info,
-                number_of_iterations=icc_iters,
+            if eos.infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf != partial_icc_vdf_info.replace(
+                number_of_iterations=icc_iters
             ):
                 return None
             if not eos.proofs.infused_challenge_chain_slot_proof.normalized_to_identity and not validate_vdf(
         @@@ -615,9 -615,9 +621,7 @@@
                         uint64(sp_total_iters - curr.total_iters),
                         signage_point.rc_vdf.output,
                     )
-                if not signage_point.cc_vdf == dataclasses.replace(
-                    cc_vdf_info_expected, number_of_iterations=delta_iters
-                ):
+                if not signage_point.cc_vdf == cc_vdf_info_expected.replace(number_of_iterations=delta_iters):
                     self.add_to_future_sp(signage_point, index)
                     return False
                 if check_from_start_of_ss:

chia/full_node/hint_management.py CHANGED Viewed

         @@@ -9,7 -9,7 +9,7 @@@ from chia.types.blockchain_format.sized
 def get_hints_and_subscription_coin_ids(
     state_change_summary: StateChangeSummary,
     has_coin_subscription: Callable[[bytes32], bool],
-    has_ph_subscription: Callable[[bytes32], bool],
+    has_puzzle_subscription: Callable[[bytes32], bool],
 ) -> Tuple[List[Tuple[bytes32, bytes]], List[bytes32]]:
     # Precondition: all hints passed in are max 32 bytes long
     # Returns the hints that we need to add to the DB, and the coin ids that need to be looked up
         @@@ -26,7 -26,7 +26,7 @@@
             lookup_coin_ids.add(coin_id)
     def add_if_ph_subscription(puzzle_hash: bytes32, coin_id: bytes32) -> None:
-        if has_ph_subscription(puzzle_hash):
+        if has_puzzle_subscription(puzzle_hash):
             lookup_coin_ids.add(coin_id)
     for spend_id, puzzle_hash in state_change_summary.removals:

chia/full_node/subscriptions.py CHANGED Viewed

         @@@ -9,136 -9,136 +9,196 @@@ from chia.types.blockchain_format.sized
 log = logging.getLogger(__name__)
-# The PeerSubscriptions class is essentially a multi-index container. It can be
-# indexed by peer_id, coin_id and puzzle_hash.
+@dataclass(frozen=True)
+class SubscriptionSet:
+    _subscriptions_for_peer: Dict[bytes32, Set[bytes32]] = field(default_factory=dict, init=False)
+    _peers_for_subscription: Dict[bytes32, Set[bytes32]] = field(default_factory=dict, init=False)
+    def add_subscription(self, peer_id: bytes32, item: bytes32) -> bool:
+        peers = self._peers_for_subscription.setdefault(item, set())
+        if peer_id in peers:
+            return False
+        subscriptions = self._subscriptions_for_peer.setdefault(peer_id, set())
+        subscriptions.add(item)
+        peers.add(peer_id)
+        return True
+    def remove_subscription(self, peer_id: bytes32, item: bytes32) -> bool:
+        subscriptions = self._subscriptions_for_peer.get(peer_id)
+        if subscriptions is None or item not in subscriptions:
+            return False
+        peers = self._peers_for_subscription[item]
+        peers.remove(peer_id)
+        subscriptions.remove(item)
+        if len(subscriptions) == 0:
+            self._subscriptions_for_peer.pop(peer_id)
+        if len(peers) == 0:
+            self._peers_for_subscription.pop(item)
+        return True
+    def has_subscription(self, item: bytes32) -> bool:
+        return item in self._peers_for_subscription
+    def count_subscriptions(self, peer_id: bytes32) -> int:
+        return len(self._subscriptions_for_peer.get(peer_id, {}))
+    def remove_peer(self, peer_id: bytes32) -> None:
+        for item in self._subscriptions_for_peer.pop(peer_id, {}):
+            self._peers_for_subscription[item].remove(peer_id)
+            if len(self._peers_for_subscription[item]) == 0:
+                self._peers_for_subscription.pop(item)
+    def subscriptions(self, peer_id: bytes32) -> Set[bytes32]:
+        return self._subscriptions_for_peer.get(peer_id, set())
+    def peers(self, item: bytes32) -> Set[bytes32]:
+        return self._peers_for_subscription.get(item, set())
+    def total_count(self) -> int:
+        return len(self._peers_for_subscription)
 @dataclass(frozen=True)
 class PeerSubscriptions:
-    # TODO: use NewType all over to describe these various uses of the same types
-    # Puzzle Hash : Set[Peer ID]
-    _coin_subscriptions: Dict[bytes32, Set[bytes32]] = field(default_factory=dict, init=False)
-    # Puzzle Hash : Set[Peer ID]
-    _ph_subscriptions: Dict[bytes32, Set[bytes32]] = field(default_factory=dict, init=False)
-    # Peer ID: Set[Coin ids]
-    _peer_coin_ids: Dict[bytes32, Set[bytes32]] = field(default_factory=dict, init=False)
-    # Peer ID: Set[puzzle_hash]
-    _peer_puzzle_hash: Dict[bytes32, Set[bytes32]] = field(default_factory=dict, init=False)
-    # Peer ID: subscription count
-    _peer_sub_counter: Dict[bytes32, int] = field(default_factory=dict, init=False)
-    def has_ph_subscription(self, ph: bytes32) -> bool:
-        return ph in self._ph_subscriptions
+    _puzzle_subscriptions: SubscriptionSet = field(default_factory=SubscriptionSet)
+    _coin_subscriptions: SubscriptionSet = field(default_factory=SubscriptionSet)
+    def has_puzzle_subscription(self, puzzle_hash: bytes32) -> bool:
+        return self._puzzle_subscriptions.has_subscription(puzzle_hash)
     def has_coin_subscription(self, coin_id: bytes32) -> bool:
-        return coin_id in self._coin_subscriptions
+        return self._coin_subscriptions.has_subscription(coin_id)
+    def peer_subscription_count(self, peer_id: bytes32) -> int:
+        puzzle_subscriptions = self._puzzle_subscriptions.count_subscriptions(peer_id)
+        coin_subscriptions = self._coin_subscriptions.count_subscriptions(peer_id)
+        return puzzle_subscriptions + coin_subscriptions
-    def add_ph_subscriptions(self, peer_id: bytes32, phs: List[bytes32], max_items: int) -> Set[bytes32]:
+    def add_puzzle_subscriptions(self, peer_id: bytes32, puzzle_hashes: List[bytes32], max_items: int) -> Set[bytes32]:
         """
-        returns the puzzle hashes that were actually subscribed to. These may be
-        fewer than requested in case:
-        * there are duplicate puzzle_hashes
-        * some puzzle hashes are already subscribed to
-        * the max_items limit is exceeded
+        Adds subscriptions until max_items is reached. Filters out duplicates and returns all additions.
         """
-        puzzle_hash_peers = self._peer_puzzle_hash.setdefault(peer_id, set())
-        existing_sub_count = self._peer_sub_counter.setdefault(peer_id, 0)
-        ret: Set[bytes32] = set()
+        subscription_count = self.peer_subscription_count(peer_id)
+        added: Set[bytes32] = set()
-        # if we've reached the limit on number of subscriptions, just bail
-        if existing_sub_count >= max_items:
+        def limit_reached() -> Set[bytes32]:
             log.info(
-                "peer_id: %s reached max number of puzzle-hash subscriptions. "
-                "Not all its coin states will be reported",
+                "Peer %s attempted to exceed the subscription limit while adding puzzle subscriptions.",
                 peer_id,
             )
-            return ret
+            return added
-        # decrement this counter as we go, to know if we've hit the limit of
-        # number of subscriptions
-        subscriptions_left = max_items - existing_sub_count
+        # If the subscription limit is reached, bail.
+        if subscription_count >= max_items:
+            return limit_reached()
-        for ph in phs:
-            ph_sub = self._ph_subscriptions.setdefault(ph, set())
-            if peer_id in ph_sub:
+        # Decrement this counter to know if we've hit the subscription limit.
+        subscriptions_left = max_items - subscription_count
+        for puzzle_hash in puzzle_hashes:
+            if not self._puzzle_subscriptions.add_subscription(peer_id, puzzle_hash):
                 continue
-            ret.add(ph)
-            ph_sub.add(peer_id)
-            puzzle_hash_peers.add(ph)
-            self._peer_sub_counter[peer_id] += 1
             subscriptions_left -= 1
+            added.add(puzzle_hash)
             if subscriptions_left == 0:
-                log.info(
-                    "peer_id: %s reached max number of puzzle-hash subscriptions. "
-                    "Not all its coin states will be reported",
-                    peer_id,
-                )
-                break
-        return ret
-    def add_coin_subscriptions(self, peer_id: bytes32, coin_ids: List[bytes32], max_items: int) -> None:
-        coin_id_peers = self._peer_coin_ids.setdefault(peer_id, set())
-        existing_sub_count = self._peer_sub_counter.setdefault(peer_id, 0)
-        # if we've reached the limit on number of subscriptions, just bail
-        if existing_sub_count >= max_items:
+                return limit_reached()
+        return added
+    def add_coin_subscriptions(self, peer_id: bytes32, coin_ids: List[bytes32], max_items: int) -> Set[bytes32]:
+        """
+        Adds subscriptions until max_items is reached. Filters out duplicates and returns all additions.
+        """
+        subscription_count = self.peer_subscription_count(peer_id)
+        added: Set[bytes32] = set()
+        def limit_reached() -> Set[bytes32]:
             log.info(
-                "peer_id: %s reached max number of coin subscriptions. Not all its coin states will be reported",
+                "Peer %s attempted to exceed the subscription limit while adding coin subscriptions.",
                 peer_id,
             )
-            return
+            return added
-        # decrement this counter as we go, to know if we've hit the limit of
-        # number of subscriptions
-        subscriptions_left = max_items - existing_sub_count
+        # If the subscription limit is reached, bail.
+        if subscription_count >= max_items:
+            return limit_reached()
+        # Decrement this counter to know if we've hit the subscription limit.
+        subscriptions_left = max_items - subscription_count
         for coin_id in coin_ids:
-            coin_sub = self._coin_subscriptions.setdefault(coin_id, set())
-            if peer_id in coin_sub:
+            if not self._coin_subscriptions.add_subscription(peer_id, coin_id):
                 continue
-            coin_sub.add(peer_id)
-            coin_id_peers.add(coin_id)
-            self._peer_sub_counter[peer_id] += 1
             subscriptions_left -= 1
+            added.add(coin_id)
             if subscriptions_left == 0:
-                log.info(
-                    "peer_id: %s reached max number of coin subscriptions. Not all its coin states will be reported",
-                    peer_id,
-                )
-                break
+                return limit_reached()
+        return added
+    def remove_puzzle_subscriptions(self, peer_id: bytes32, puzzle_hashes: List[bytes32]) -> Set[bytes32]:
+        """
+        Removes subscriptions. Filters out duplicates and returns all removals.
+        """
+        removed: Set[bytes32] = set()
+        for puzzle_hash in puzzle_hashes:
+            if not self._puzzle_subscriptions.remove_subscription(peer_id, puzzle_hash):
+                continue
+            removed.add(puzzle_hash)
+        return removed
+    def remove_coin_subscriptions(self, peer_id: bytes32, coin_ids: List[bytes32]) -> Set[bytes32]:
+        """
+        Removes subscriptions. Filters out duplicates and returns all removals.
+        """
+        removed: Set[bytes32] = set()
+        for coin_id in coin_ids:
+            if not self._coin_subscriptions.remove_subscription(peer_id, coin_id):
+                continue
+            removed.add(coin_id)
+        return removed
     def remove_peer(self, peer_id: bytes32) -> None:
-        counter = 0
-        puzzle_hashes = self._peer_puzzle_hash.get(peer_id)
-        if puzzle_hashes is not None:
-            for ph in puzzle_hashes:
-                subs = self._ph_subscriptions[ph]
-                subs.remove(peer_id)
-                counter += 1
-                if subs == set():
-                    self._ph_subscriptions.pop(ph)
-            self._peer_puzzle_hash.pop(peer_id)
-        coin_ids = self._peer_coin_ids.get(peer_id)
-        if coin_ids is not None:
-            for coin_id in coin_ids:
-                subs = self._coin_subscriptions[coin_id]
-                subs.remove(peer_id)
-                counter += 1
-                if subs == set():
-                    self._coin_subscriptions.pop(coin_id)
-            self._peer_coin_ids.pop(peer_id)
-        if peer_id in self._peer_sub_counter:
-            num_subs = self._peer_sub_counter.pop(peer_id)
-            assert num_subs == counter
+        self._puzzle_subscriptions.remove_peer(peer_id)
+        self._coin_subscriptions.remove_peer(peer_id)
+    def coin_subscriptions(self, peer_id: bytes32) -> Set[bytes32]:
+        return self._coin_subscriptions.subscriptions(peer_id)
+    def puzzle_subscriptions(self, peer_id: bytes32) -> Set[bytes32]:
+        return self._puzzle_subscriptions.subscriptions(peer_id)
     def peers_for_coin_id(self, coin_id: bytes32) -> Set[bytes32]:
-        return self._coin_subscriptions.get(coin_id, set())
+        return self._coin_subscriptions.peers(coin_id)
     def peers_for_puzzle_hash(self, puzzle_hash: bytes32) -> Set[bytes32]:
-        return self._ph_subscriptions.get(puzzle_hash, set())
+        return self._puzzle_subscriptions.peers(puzzle_hash)
+    def coin_subscription_count(self) -> int:
+        return self._coin_subscriptions.total_count()
+    def puzzle_subscription_count(self) -> int:
+        return self._puzzle_subscriptions.total_count()

chia/full_node/weight_proof.py ADDED Viewed

         @@@ -442,7 -442,7 +442,7 @@@ class WeightProofHandler
                 None,
                 None,
                 None,
-                curr.reward_chain_block.signage_point_index,
+                uint8(curr.reward_chain_block.signage_point_index),
                 None,
                 None,
                 None,
         @@@ -549,7 -549,7 +549,7 @@@
             curr.challenge_chain_ip_proof,
             icc_ip_proof,
             cc_sp_info,
-            curr.reward_chain_block.signage_point_index,
+            uint8(curr.reward_chain_block.signage_point_index),
             None,
             None,
             None,
         @@@ -565,7 -565,7 +565,7 @@@
         if len(weight_proof.sub_epochs) == 0:
             return False, uint32(0)
-        peak_height = weight_proof.recent_chain_data[-1].reward_chain_block.height
+        peak_height = uint32(weight_proof.recent_chain_data[-1].reward_chain_block.height)
         log.info(f"validate weight proof peak height {peak_height}")
         summaries, sub_epoch_weight_list = _validate_sub_epoch_summaries(self.constants, weight_proof)
         if summaries is None:
         @@@ -707,10 -707,10 +707,10 @@@ def _create_sub_epoch_data
 ) -> SubEpochData:
     reward_chain_hash: bytes32 = sub_epoch_summary.reward_chain_hash
     #  Number of subblocks overflow in previous slot
-    previous_sub_epoch_overflows: uint8 = sub_epoch_summary.num_blocks_overflow  # total in sub epoch - expected
+    previous_sub_epoch_overflows = uint8(sub_epoch_summary.num_blocks_overflow)  # total in sub epoch - expected
     #  New work difficulty and iterations per sub-slot
-    sub_slot_iters: Optional[uint64] = sub_epoch_summary.new_sub_slot_iters
-    new_difficulty: Optional[uint64] = sub_epoch_summary.new_difficulty
+    sub_slot_iters: Optional[int] = sub_epoch_summary.new_sub_slot_iters
+    new_difficulty: Optional[int] = sub_epoch_summary.new_difficulty
     return SubEpochData(reward_chain_hash, previous_sub_epoch_overflows, sub_slot_iters, new_difficulty)
         @@@ -746,7 -746,7 +746,7 @@@ async def _challenge_block_vdfs
         header_block.challenge_chain_ip_proof,
         None,
         cc_sp_info,
-        header_block.reward_chain_block.signage_point_index,
+        uint8(header_block.reward_chain_block.signage_point_index),
         None,
         None,
         None,
         @@@ -886,7 -886,7 +886,7 @@@ def _map_sub_epoch_summaries
         # if new epoch update diff and iters
         if data.new_difficulty is not None:
-            curr_difficulty = data.new_difficulty
+            curr_difficulty = uint64(data.new_difficulty)
         # add to dict
         summaries.append(ses)
         @@@ -998,7 -998,7 +998,7 @@@ def _validate_segment
                 return False, uint64(0), uint64(0), uint64(0), []
             assert sub_slot_data.signage_point_index is not None
             ip_iters = ip_iters + calculate_ip_iters(
-                constants, curr_ssi, sub_slot_data.signage_point_index, required_iters
+                constants, curr_ssi, uint8(sub_slot_data.signage_point_index), required_iters
             )
             vdf_list = _get_challenge_block_vdfs(constants, idx, segment.sub_slots, curr_ssi)
             to_validate.extend(vdf_list)
         @@@ -1025,7 -1025,7 +1025,7 @@@ def _get_challenge_block_vdfs
         assert sub_slot_data.signage_point_index
         sp_input = ClassgroupElement.get_default_element()
         if not sub_slot_data.cc_signage_point.normalized_to_identity and sub_slot_idx >= 1:
-            is_overflow = is_overflow_block(constants, sub_slot_data.signage_point_index)
+            is_overflow = is_overflow_block(constants, uint8(sub_slot_data.signage_point_index))
             prev_ssd = sub_slots[sub_slot_idx - 1]
             sp_input = sub_slot_data_vdf_input(
                 constants, sub_slot_data, sub_slot_idx, sub_slots, is_overflow, prev_ssd.is_end_of_slot(), ssi
         @@@ -1103,7 -1103,7 +1103,7 @@@ def _validate_sub_slot_data
             assert sub_slot_data.cc_sp_vdf_info
             input = ClassgroupElement.get_default_element()
             if not sub_slot_data.cc_signage_point.normalized_to_identity:
-                is_overflow = is_overflow_block(constants, sub_slot_data.signage_point_index)
+                is_overflow = is_overflow_block(constants, uint8(sub_slot_data.signage_point_index))
                 input = sub_slot_data_vdf_input(
                     constants, sub_slot_data, sub_slot_idx, sub_slots, is_overflow, prev_ssd.is_end_of_slot(), ssi
                 )
         @@@ -1208,9 -1208,9 +1208,9 @@@ def validate_recent_blocks
     last_blocks_to_validate = 100  # todo remove cap after benchmarks
     for summary in summaries[:ses_idx]:
         if summary.new_sub_slot_iters is not None:
-            ssi = summary.new_sub_slot_iters
+            ssi = uint64(summary.new_sub_slot_iters)
         if summary.new_difficulty is not None:
-            diff = summary.new_difficulty
+            diff = uint64(summary.new_difficulty)
     ses_blocks, sub_slots, transaction_blocks = 0, 0, 0
     challenge, prev_challenge = recent_chain.recent_chain_data[0].reward_chain_block.pos_ss_cc_challenge_hash, None
         @@@ -1226,18 -1226,18 +1226,18 @@@
         for sub_slot in block.finished_sub_slots:
             prev_challenge = sub_slot.challenge_chain.challenge_chain_end_of_slot_vdf.challenge
             challenge = sub_slot.challenge_chain.get_hash()
-            deficit = sub_slot.reward_chain.deficit
+            deficit = uint8(sub_slot.reward_chain.deficit)
             if sub_slot.challenge_chain.subepoch_summary_hash is not None:
                 ses = True
                 assert summaries[ses_idx].get_hash() == sub_slot.challenge_chain.subepoch_summary_hash
                 ses_idx += 1
             if sub_slot.challenge_chain.new_sub_slot_iters is not None:
-                ssi = sub_slot.challenge_chain.new_sub_slot_iters
+                ssi = uint64(sub_slot.challenge_chain.new_sub_slot_iters)
             if sub_slot.challenge_chain.new_difficulty is not None:
-                diff = sub_slot.challenge_chain.new_difficulty
+                diff = uint64(sub_slot.challenge_chain.new_difficulty)
         if (challenge is not None) and (prev_challenge is not None):
-            overflow = is_overflow_block(constants, block.reward_chain_block.signage_point_index)
+            overflow = is_overflow_block(constants, uint8(block.reward_chain_block.signage_point_index))
             if not adjusted:
                 assert prev_block_record is not None
                 prev_block_record = dataclasses.replace(
         @@@ -1334,7 -1334,7 +1334,7 @@@ def __validate_pospace
     sub_slot_data: SubSlotData = segment.sub_slots[idx]
-    if sub_slot_data.signage_point_index and is_overflow_block(constants, sub_slot_data.signage_point_index):
+    if sub_slot_data.signage_point_index and is_overflow_block(constants, uint8(sub_slot_data.signage_point_index)):
         curr_slot = segment.sub_slots[idx - 1]
         assert curr_slot.cc_slot_end_info
         challenge = curr_slot.cc_slot_end_info.challenge
         @@@ -1391,14 -1391,14 +1391,14 @@@ def __get_rc_sub_slot
     slots_n = 1
     assert first
     assert first.signage_point_index is not None
-    if is_overflow_block(constants, first.signage_point_index):
+    if is_overflow_block(constants, uint8(first.signage_point_index)):
         if idx >= 2 and slots[idx - 2].cc_slot_end is None:
             slots_n = 2
     new_diff = None if ses is None else ses.new_difficulty
     new_ssi = None if ses is None else ses.new_sub_slot_iters
     ses_hash: Optional[bytes32] = None if ses is None else ses.get_hash()
-    overflow = is_overflow_block(constants, first.signage_point_index)
+    overflow = is_overflow_block(constants, uint8(first.signage_point_index))
     if overflow:
         if idx >= 2 and slots[idx - 2].cc_slot_end is not None and slots[idx - 1].cc_slot_end is not None:
             ses_hash = None
         @@@ -1483,9 -1483,9 +1483,9 @@@ def _get_curr_diff_ssi
     curr_ssi = constants.SUB_SLOT_ITERS_STARTING
     for ses in reversed(summaries[0:idx]):
         if ses.new_sub_slot_iters is not None:
-            curr_ssi = ses.new_sub_slot_iters
+            curr_ssi = uint64(ses.new_sub_slot_iters)
             assert ses.new_difficulty is not None
-            curr_difficulty = ses.new_difficulty
+            curr_difficulty = uint64(ses.new_difficulty)
             break
     return curr_difficulty, curr_ssi
         @@@ -1521,7 -1521,7 +1521,7 @@@ def _get_last_ses_hash
                         if slot.challenge_chain.subepoch_summary_hash is not None:
                             return (
                                 slot.challenge_chain.subepoch_summary_hash,
-                                curr.reward_chain_block.height,
+                                uint32(curr.reward_chain_block.height),
                             )
                 idx += 1
     return None, uint32(0)
         @@@ -1558,8 -1558,8 +1558,8 @@@ def get_sp_total_iters
     assert sub_slot_data.cc_ip_vdf_info is not None
     assert sub_slot_data.total_iters is not None
     assert sub_slot_data.signage_point_index is not None
-    sp_iters: uint64 = calculate_sp_iters(constants, ssi, sub_slot_data.signage_point_index)
-    ip_iters: uint64 = sub_slot_data.cc_ip_vdf_info.number_of_iterations
+    sp_iters: uint64 = calculate_sp_iters(constants, ssi, uint8(sub_slot_data.signage_point_index))
+    ip_iters: uint64 = uint64(sub_slot_data.cc_ip_vdf_info.number_of_iterations)
     sp_sub_slot_total_iters = uint128(sub_slot_data.total_iters - ip_iters)
     if is_overflow:
         sp_sub_slot_total_iters = uint128(sp_sub_slot_total_iters - ssi)
         @@@ -1645,7 -1645,7 +1645,7 @@@ async def validate_weight_proof_inner
     if len(weight_proof.sub_epochs) == 0:
         return False, []
-    peak_height = weight_proof.recent_chain_data[-1].reward_chain_block.height
+    peak_height = uint32(weight_proof.recent_chain_data[-1].reward_chain_block.height)
     log.info(f"validate weight proof peak height {peak_height}")
     seed = summaries[-2].get_hash()
     rng = random.Random(seed)
-- /dev/null
++ b/chia/legacy/__init__.py

chia/plotting/cache.py CHANGED Viewed

         @@@ -138,6 -138,6 +138,16 @@@ class Cache
                 cache_data: CacheDataV1 = CacheDataV1.from_bytes(stored_cache.blob)
                 self._data = {}
                 estimated_c2_sizes: Dict[int, int] = {}
+                measured_sizes: Dict[int, int] = {
+                    32: 738,
+                    33: 1083,
+                    34: 1771,
+                    35: 3147,
+                    36: 5899,
+                    37: 11395,
+                    38: 22395,
+                    39: 44367,
+                }
                 for path, cache_entry in cache_data.entries:
                     new_entry = CacheEntry(
                         DiskProver.from_bytes(cache_entry.prover_data),
         @@@ -160,7 -160,7 +170,14 @@@
                     # static data: version(2) + table pointers (<=96) + id(32) + k(1) => ~130
                     # path: up to ~1870, all above will lead to false positive.
                     # See https://github.com/Chia-Network/chiapos/blob/3ee062b86315823dd775453ad320b8be892c7df3/src/prover_disk.hpp#L282-L287  # noqa: E501
-                    if prover_size > (estimated_c2_sizes[k] + memo_size + 2000):
+                    # Use experimental measurements if more than estimates
+                    # https://github.com/Chia-Network/chia-blockchain/issues/16063
+                    check_size = estimated_c2_sizes[k] + memo_size + 2000
+                    if k in measured_sizes:
+                        check_size = max(check_size, measured_sizes[k])
+                    if prover_size > check_size:
                         log.warning(
                             "Suspicious cache entry dropped. Recommended: stop the harvester, remove "
                             f"{self._path}, restart. Entry: size {prover_size}, path {path}"

chia/pools/pool_puzzles.py CHANGED Viewed

         @@@ -4,7 -4,7 +4,7 @@@ import loggin
 from typing import List, Optional, Tuple
 from chia_rs import G1Element
-from clvm.casts import int_from_bytes, int_to_bytes
+from clvm.casts import int_from_bytes
 from chia.clvm.singleton import SINGLETON_LAUNCHER
 from chia.consensus.block_rewards import calculate_pool_reward
         @@@ -93,7 -93,7 +93,7 @@@ def create_p2_singleton_puzzle
 def launcher_id_to_p2_puzzle_hash(launcher_id: bytes32, seconds_delay: uint64, delayed_puzzle_hash: bytes32) -> bytes32:
     return create_p2_singleton_puzzle(
-        SINGLETON_MOD_HASH, launcher_id, int_to_bytes(seconds_delay), delayed_puzzle_hash
+        SINGLETON_MOD_HASH, launcher_id, seconds_delay, delayed_puzzle_hash
     ).get_tree_hash()

chia/rpc/full_node_rpc_api.py CHANGED Viewed

         @@@ -102,6 -102,6 +102,7 @@@ class FullNodeRpcApi
             "/get_unfinished_block_headers": self.get_unfinished_block_headers,
             "/get_network_space": self.get_network_space,
             "/get_additions_and_removals": self.get_additions_and_removals,
+            "/get_aggsig_additional_data": self.get_aggsig_additional_data,
             # this function is just here for backwards-compatibility. It will probably
             # be removed in the future
             "/get_initial_freeze_period": self.get_initial_freeze_period,
         @@@ -556,18 -556,18 +557,17 @@@
             return {"headers": []}
         response_headers: List[UnfinishedHeaderBlock] = []
-        for ub_height, block, _ in (self.service.full_node_store.get_unfinished_blocks()).values():
-            if ub_height == peak.height:
-                unfinished_header_block = UnfinishedHeaderBlock(
-                    block.finished_sub_slots,
-                    block.reward_chain_block,
-                    block.challenge_chain_sp_proof,
-                    block.reward_chain_sp_proof,
-                    block.foliage,
-                    block.foliage_transaction_block,
-                    b"",
-                )
-                response_headers.append(unfinished_header_block)
+        for block in self.service.full_node_store.get_unfinished_blocks(peak.height):
+            unfinished_header_block = UnfinishedHeaderBlock(
+                block.finished_sub_slots,
+                block.reward_chain_block,
+                block.challenge_chain_sp_proof,
+                block.reward_chain_sp_proof,
+                block.foliage,
+                block.foliage_transaction_block,
+                b"",
+            )
+            response_headers.append(unfinished_header_block)
         return {"headers": response_headers}
     async def get_network_space(self, request: Dict[str, Any]) -> EndpointResult:
         @@@ -806,6 -806,6 +806,9 @@@
             "removals": [coin_record_dict_backwards_compat(cr.to_json_dict()) for cr in removals],
         }
+    async def get_aggsig_additional_data(self, _: Dict[str, Any]) -> EndpointResult:
+        return {"additional_data": self.service.constants.AGG_SIG_ME_ADDITIONAL_DATA.hex()}
     async def get_all_mempool_tx_ids(self, _: Dict[str, Any]) -> EndpointResult:
         ids = list(self.service.mempool_manager.mempool.all_item_ids())
         return {"tx_ids": ids}

chia/rpc/full_node_rpc_client.py CHANGED Viewed

         @@@ -159,6 -159,6 +159,10 @@@ class FullNodeRpcClient(RpcClient)
         response = await self.fetch("get_coin_records_by_parent_ids", d)
         return [CoinRecord.from_json_dict(coin_record_dict_backwards_compat(coin)) for coin in response["coin_records"]]
+    async def get_aggsig_additional_data(self) -> bytes32:
+        result = await self.fetch("get_aggsig_additional_data", {})
+        return bytes32.from_hexstr(result["additional_data"])
     async def get_coin_records_by_hint(
         self,
         hint: bytes32,

chia/rpc/wallet_rpc_api.py CHANGED Viewed

         @@@ -3498,7 -3494,7 +3498,7 @@@ class WalletRpcApi
         full_puzzle = nft_puzzles.create_full_puzzle(
             uncurried_nft.singleton_launcher_id,
             metadata,
-            uncurried_nft.metadata_updater_hash,
+            bytes32(uncurried_nft.metadata_updater_hash.as_atom()),
             inner_puzzle,
         )

chia/rpc/wallet_rpc_client.py CHANGED Viewed

         @@@ -1,6 -1,6 +1,6 @@@
 from __future__ import annotations
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union, cast
 from chia.data_layer.data_layer_wallet import Mirror, SingletonRecord
 from chia.pools.pool_wallet_info import PoolWalletInfo
         @@@ -9,6 -9,6 +9,7 @@@ from chia.types.blockchain_format.coin
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
+from chia.types.spend_bundle import SpendBundle
 from chia.util.bech32m import encode_puzzle_hash
 from chia.util.ints import uint16, uint32, uint64
 from chia.wallet.conditions import Condition, ConditionValidTimes, conditions_to_json_dicts
         @@@ -41,97 -41,97 +42,117 @@@ class WalletRpcClient(RpcClient)
     """
     # Key Management APIs
-    async def log_in(self, fingerprint: int) -> Dict:
+    async def log_in(self, fingerprint: int) -> Union[Dict[str, Any], Any]:
         try:
-            return await self.fetch(
-                "log_in",
-                {"fingerprint": fingerprint, "type": "start"},
-            )
+            return await self.fetch("log_in", {"fingerprint": fingerprint, "type": "start"})
         except ValueError as e:
             return e.args[0]
     async def set_wallet_resync_on_startup(self, enable: bool = True) -> Dict[str, Any]:
-        return await self.fetch(
-            path="set_wallet_resync_on_startup",
-            request_json={"enable": enable},
-        )
+        return await self.fetch(path="set_wallet_resync_on_startup", request_json={"enable": enable})
-    async def get_logged_in_fingerprint(self) -> int:
-        return (await self.fetch("get_logged_in_fingerprint", {}))["fingerprint"]
+    async def get_logged_in_fingerprint(self) -> Optional[int]:
+        response = await self.fetch("get_logged_in_fingerprint", {})
+        # TODO: casting due to lack of type checked deserialization
+        return cast(Optional[int], response["fingerprint"])
     async def get_public_keys(self) -> List[int]:
-        return (await self.fetch("get_public_keys", {}))["public_key_fingerprints"]
+        response = await self.fetch("get_public_keys", {})
+        # TODO: casting due to lack of type checked deserialization
+        return cast(List[int], response["public_key_fingerprints"])
-    async def get_private_key(self, fingerprint: int) -> Dict:
-        return (await self.fetch("get_private_key", {"fingerprint": fingerprint}))["private_key"]
+    async def get_private_key(self, fingerprint: int) -> Dict[str, Any]:
+        request = {"fingerprint": fingerprint}
+        response = await self.fetch("get_private_key", request)
+        # TODO: casting due to lack of type checked deserialization
+        return cast(Dict[str, Any], response["private_key"])
     async def generate_mnemonic(self) -> List[str]:
-        return (await self.fetch("generate_mnemonic", {}))["mnemonic"]
+        response = await self.fetch("generate_mnemonic", {})
+        # TODO: casting due to lack of type checked deserialization
+        return cast(List[str], response["mnemonic"])
     async def add_key(self, mnemonic: List[str], request_type: str = "new_wallet") -> Dict[str, Any]:
-        return await self.fetch("add_key", {"mnemonic": mnemonic, "type": request_type})
+        request = {"mnemonic": mnemonic, "type": request_type}
+        return await self.fetch("add_key", request)
     async def delete_key(self, fingerprint: int) -> Dict[str, Any]:
-        return await self.fetch("delete_key", {"fingerprint": fingerprint})
+        request = {"fingerprint": fingerprint}
+        return await self.fetch("delete_key", request)
     async def check_delete_key(self, fingerprint: int, max_ph_to_search: int = 100) -> Dict[str, Any]:
-        return await self.fetch("check_delete_key", {"fingerprint": fingerprint, "max_ph_to_search": max_ph_to_search})
+        request = {"fingerprint": fingerprint, "max_ph_to_search": max_ph_to_search}
+        return await self.fetch("check_delete_key", request)
     async def delete_all_keys(self) -> Dict[str, Any]:
         return await self.fetch("delete_all_keys", {})
     # Wallet Node APIs
     async def get_sync_status(self) -> bool:
-        return (await self.fetch("get_sync_status", {}))["syncing"]
+        response = await self.fetch("get_sync_status", {})
+        # TODO: casting due to lack of type checked deserialization
+        return cast(bool, response["syncing"])
     async def get_synced(self) -> bool:
-        return (await self.fetch("get_sync_status", {}))["synced"]
+        response = await self.fetch("get_sync_status", {})
+        # TODO: casting due to lack of type checked deserialization
+        return cast(bool, response["synced"])
     async def get_height_info(self) -> uint32:
-        return (await self.fetch("get_height_info", {}))["height"]
+        response = await self.fetch("get_height_info", {})
+        # TODO: casting due to lack of type checked deserialization
+        return cast(uint32, response["height"])
-    async def push_tx(self, spend_bundle):
+    async def push_tx(self, spend_bundle: SpendBundle) -> Dict[str, Any]:
         return await self.fetch("push_tx", {"spend_bundle": bytes(spend_bundle).hex()})
-    async def push_transactions(self, txs: List[TransactionRecord]):
+    async def push_transactions(self, txs: List[TransactionRecord]) -> Dict[str, Any]:
         transactions = [bytes(tx).hex() for tx in txs]
         return await self.fetch("push_transactions", {"transactions": transactions})
     async def farm_block(self, address: str) -> Dict[str, Any]:
         return await self.fetch("farm_block", {"address": address})
     async def get_timestamp_for_height(self, height: uint32) -> uint64:
-        return uint64((await self.fetch("get_timestamp_for_height", {"height": height}))["timestamp"])
+        request = {"height": height}
+        response = await self.fetch("get_timestamp_for_height", request)
+        # TODO: casting due to lack of type checked deserialization
+        return cast(uint64, response["timestamp"])
     # Wallet Management APIs
     async def get_wallets(self, wallet_type: Optional[WalletType] = None) -> List[Dict[str, Any]]:
-        request: Dict[str, Any] = {}
-        if wallet_type is not None:
-            request["type"] = wallet_type
-        return (await self.fetch("get_wallets", request))["wallets"]
+        if wallet_type is None:
+            request = {}
+        else:
+            request = {"type": wallet_type}
+        response = await self.fetch("get_wallets", request)
+        # TODO: casting due to lack of type checked deserialization
+        return cast(List[Dict[str, Any]], response["wallets"])
     # Wallet APIs
-    async def get_wallet_balance(self, wallet_id: int) -> Dict:
-        return (await self.fetch("get_wallet_balance", {"wallet_id": wallet_id}))["wallet_balance"]
+    async def get_wallet_balance(self, wallet_id: int) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id}
+        response = await self.fetch("get_wallet_balance", request)
+        # TODO: casting due to lack of type checked deserialization
+        return cast(Dict[str, Any], response["wallet_balance"])
-    async def get_wallet_balances(self, wallet_ids: Optional[List[int]] = None) -> Dict:
-        return (await self.fetch("get_wallet_balances", {"wallet_ids": wallet_ids}))["wallet_balances"]
+    async def get_wallet_balances(self, wallet_ids: Optional[List[int]] = None) -> Dict[str, Dict[str, Any]]:
+        request = {"wallet_ids": wallet_ids}
+        response = await self.fetch("get_wallet_balances", request)
+        # TODO: casting due to lack of type checked deserialization
+        return cast(Dict[str, Dict[str, Any]], response["wallet_balances"])
     async def get_transaction(self, wallet_id: int, transaction_id: bytes32) -> TransactionRecord:
-        res = await self.fetch(
-            "get_transaction",
-            {"walled_id": wallet_id, "transaction_id": transaction_id.hex()},
-        )
-        return TransactionRecord.from_json_dict_convenience(res["transaction"])
+        request = {"walled_id": wallet_id, "transaction_id": transaction_id.hex()}
+        response = await self.fetch("get_transaction", request)
+        return TransactionRecord.from_json_dict_convenience(response["transaction"])
     async def get_transactions(
         self,
         wallet_id: int,
-        start: int = None,
-        end: int = None,
-        sort_key: SortKey = None,
+        start: Optional[int] = None,
+        end: Optional[int] = None,
+        sort_key: Optional[SortKey] = None,
         reverse: bool = False,
         to_address: Optional[str] = None,
         type_filter: Optional[TransactionTypeFilter] = None,
         @@@ -156,29 -156,29 +177,26 @@@
         if confirmed is not None:
             request["confirmed"] = confirmed
-        res = await self.fetch(
-            "get_transactions",
-            request,
-        )
+        res = await self.fetch("get_transactions", request)
         return [TransactionRecord.from_json_dict_convenience(tx) for tx in res["transactions"]]
     async def get_transaction_count(
-        self,
-        wallet_id: int,
-        confirmed: Optional[bool] = None,
-        type_filter: Optional[TransactionTypeFilter] = None,
-    ) -> List[TransactionRecord]:
+        self, wallet_id: int, confirmed: Optional[bool] = None, type_filter: Optional[TransactionTypeFilter] = None
+    ) -> int:
         request: Dict[str, Any] = {"wallet_id": wallet_id}
         if type_filter is not None:
             request["type_filter"] = type_filter.to_json_dict()
         if confirmed is not None:
             request["confirmed"] = confirmed
         res = await self.fetch("get_transaction_count", request)
-        return res["count"]
+        # TODO: casting due to lack of type checked deserialization
+        return cast(int, res["count"])
     async def get_next_address(self, wallet_id: int, new_address: bool) -> str:
-        return (await self.fetch("get_next_address", {"wallet_id": wallet_id, "new_address": new_address}))["address"]
+        request = {"wallet_id": wallet_id, "new_address": new_address}
+        response = await self.fetch("get_next_address", request)
+        # TODO: casting due to lack of type checked deserialization
+        return cast(str, response["address"])
     async def send_transaction(
         self,
         @@@ -212,9 -212,9 +230,9 @@@
     async def send_transaction_multi(
         self,
         wallet_id: int,
-        additions: List[Dict],
+        additions: List[Dict[str, Any]],
         tx_config: TXConfig,
-        coins: List[Coin] = None,
+        coins: Optional[List[Coin]] = None,
         fee: uint64 = uint64(0),
         push: bool = True,
     ) -> TransactionRecord:
         @@@ -244,40 -244,40 +262,38 @@@
         force: bool = False,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
-    ) -> Dict:
-        response = await self.fetch(
-            "spend_clawback_coins",
-            {
-                "coin_ids": [cid.hex() for cid in coin_ids],
-                "fee": fee,
-                "force": force,
-                "extra_conditions": conditions_to_json_dicts(extra_conditions),
-                **timelock_info.to_json_dict(),
-            },
-        )
+    ) -> Dict[str, Any]:
+        request = {
+            "coin_ids": [cid.hex() for cid in coin_ids],
+            "fee": fee,
+            "force": force,
+            "extra_conditions": conditions_to_json_dicts(extra_conditions),
+            **timelock_info.to_json_dict(),
+        }
+        response = await self.fetch("spend_clawback_coins", request)
         return response
     async def delete_unconfirmed_transactions(self, wallet_id: int) -> None:
-        await self.fetch(
-            "delete_unconfirmed_transactions",
-            {"wallet_id": wallet_id},
-        )
-        return None
+        await self.fetch("delete_unconfirmed_transactions", {"wallet_id": wallet_id})
     async def get_current_derivation_index(self) -> str:
-        return (await self.fetch("get_current_derivation_index", {}))["index"]
+        response = await self.fetch("get_current_derivation_index", {})
+        index = response["index"]
+        return str(index)
     async def extend_derivation_index(self, index: int) -> str:
-        return (await self.fetch("extend_derivation_index", {"index": index}))["index"]
+        response = await self.fetch("extend_derivation_index", {"index": index})
+        updated_index = response["index"]
+        return str(updated_index)
-    async def get_farmed_amount(self) -> Dict:
+    async def get_farmed_amount(self) -> Dict[str, Any]:
         return await self.fetch("get_farmed_amount", {})
     async def create_signed_transactions(
         self,
-        additions: List[Dict],
+        additions: List[Dict[str, Any]],
         tx_config: TXConfig,
-        coins: List[Coin] = None,
+        coins: Optional[List[Coin]] = None,
         fee: uint64 = uint64(0),
         wallet_id: Optional[int] = None,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         @@@ -291,7 -291,7 +307,7 @@@
             if "memos" in ad:
                 additions_hex[-1]["memos"] = ad["memos"]
-        request: Dict[str, Any] = {
+        request = {
             "additions": additions_hex,
             "fee": fee,
             "extra_conditions": conditions_to_json_dicts(extra_conditions),
         @@@ -307,14 -307,14 +323,14 @@@
         if wallet_id:
             request["wallet_id"] = wallet_id
-        response: Dict = await self.fetch("create_signed_transaction", request)
+        response = await self.fetch("create_signed_transaction", request)
         return [TransactionRecord.from_json_dict_convenience(tx) for tx in response["signed_txs"]]
     async def create_signed_transaction(
         self,
-        additions: List[Dict],
+        additions: List[Dict[str, Any]],
         tx_config: TXConfig,
-        coins: List[Coin] = None,
+        coins: Optional[List[Coin]] = None,
         fee: uint64 = uint64(0),
         wallet_id: Optional[int] = None,
         push: bool = False,
         @@@ -336,36 -336,36 +352,22 @@@
         return txs[0]
-    async def select_coins(
-        self,
-        amount: int,
-        wallet_id: int,
-        coin_selection_config: CoinSelectionConfig,
-    ) -> List[Coin]:
-        request = {
-            "amount": amount,
-            "wallet_id": wallet_id,
-            **coin_selection_config.to_json_dict(),
-        }
-        response: Dict[str, List[Dict]] = await self.fetch("select_coins", request)
+    async def select_coins(self, amount: int, wallet_id: int, coin_selection_config: CoinSelectionConfig) -> List[Coin]:
+        request = {"amount": amount, "wallet_id": wallet_id, **coin_selection_config.to_json_dict()}
+        response = await self.fetch("select_coins", request)
         return [Coin.from_json_dict(coin) for coin in response["coins"]]
     async def get_coin_records(self, request: GetCoinRecords) -> Dict[str, Any]:
         return await self.fetch("get_coin_records", request.to_json_dict())
     async def get_spendable_coins(
-        self,
-        wallet_id: int,
-        coin_selection_config: CoinSelectionConfig,
+        self, wallet_id: int, coin_selection_config: CoinSelectionConfig
     ) -> Tuple[List[CoinRecord], List[CoinRecord], List[Coin]]:
         """
         We return a tuple containing: (confirmed records, unconfirmed removals, unconfirmed additions)
         """
-        request = {
-            "wallet_id": wallet_id,
-            **coin_selection_config.to_json_dict(),
-        }
-        response: Dict[str, List[Dict]] = await self.fetch("get_spendable_coins", request)
+        request = {"wallet_id": wallet_id, **coin_selection_config.to_json_dict()}
+        response = await self.fetch("get_spendable_coins", request)
         confirmed_wrs = [CoinRecord.from_json_dict(coin) for coin in response["confirmed_records"]]
         unconfirmed_removals = [CoinRecord.from_json_dict(coin) for coin in response["unconfirmed_removals"]]
         unconfirmed_additions = [Coin.from_json_dict(coin) for coin in response["unconfirmed_additions"]]
         @@@ -377,7 -377,7 +379,7 @@@
         include_spent_coins: bool = True,
         start_height: Optional[int] = None,
         end_height: Optional[int] = None,
-    ) -> List:
+    ) -> List[CoinRecord]:
         names_hex = [name.hex() for name in names]
         request = {"names": names_hex, "include_spent_coins": include_spent_coins}
         if start_height is not None:
         @@@ -396,8 -396,8 +398,8 @@@
         name: Optional[str] = "DID Wallet",
         backup_ids: List[str] = [],
         required_num: int = 0,
-    ) -> Dict:
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_type": "did_wallet",
             "did_type": "new",
             "backup_dids": backup_ids,
         @@@ -409,26 -409,26 +411,18 @@@
         response = await self.fetch("create_new_wallet", request)
         return response
-    async def get_did_id(self, wallet_id: int) -> Dict:
-        request: Dict[str, Any] = {
-            "wallet_id": wallet_id,
-        }
+    async def get_did_id(self, wallet_id: int) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id}
         response = await self.fetch("did_get_did", request)
         return response
-    async def get_did_info(self, coin_id: str, latest: bool) -> Dict:
-        request: Dict[str, Any] = {
-            "coin_id": coin_id,
-            "latest": latest,
-        }
+    async def get_did_info(self, coin_id: str, latest: bool) -> Dict[str, Any]:
+        request = {"coin_id": coin_id, "latest": latest}
         response = await self.fetch("did_get_info", request)
         return response
-    async def create_did_backup_file(self, wallet_id: int, filename: str) -> Dict:
-        request: Dict[str, Any] = {
-            "wallet_id": wallet_id,
-            "filename": filename,
-        }
+    async def create_did_backup_file(self, wallet_id: int, filename: str) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id, "filename": filename}
         response = await self.fetch("did_create_backup_file", request)
         return response
         @@@ -441,7 -441,7 +435,7 @@@
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
-    ) -> Dict:
+    ) -> Dict[str, Any]:
         request: Dict[str, Any] = {
             "wallet_id": wallet_id,
             "new_list": recovery_list,
         @@@ -454,10 -454,10 +448,8 @@@
         response = await self.fetch("did_update_recovery_ids", request)
         return response
-    async def get_did_recovery_list(self, wallet_id: int) -> Dict:
-        request: Dict[str, Any] = {
-            "wallet_id": wallet_id,
-        }
+    async def get_did_recovery_list(self, wallet_id: int) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id}
         response = await self.fetch("did_get_recovery_list", request)
         return response
         @@@ -468,7 -468,7 +460,7 @@@
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = False,
-    ) -> Dict:
+    ) -> Dict[str, Any]:
         request: Dict[str, Any] = {
             "wallet_id": wallet_id,
             "extra_conditions": conditions_to_json_dicts(extra_conditions),
         @@@ -482,12 -482,12 +474,12 @@@
     async def update_did_metadata(
         self,
         wallet_id: int,
-        metadata: Dict,
+        metadata: Dict[str, Any],
         tx_config: TXConfig,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
-    ) -> Dict:
+    ) -> Dict[str, Any]:
         request: Dict[str, Any] = {
             "wallet_id": wallet_id,
             "metadata": metadata,
         @@@ -499,19 -499,19 +491,19 @@@
         response = await self.fetch("did_update_metadata", request)
         return response
-    async def get_did_metadata(self, wallet_id: int) -> Dict:
-        request: Dict[str, Any] = {
-            "wallet_id": wallet_id,
-        }
+    async def get_did_metadata(self, wallet_id: int) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id}
         response = await self.fetch("did_get_metadata", request)
         return response
     async def find_lost_did(
-        self, coin_id: str, recovery_list_hash: Optional[str], metadata: Optional[Dict], num_verification: Optional[int]
-    ) -> Dict:
-        request: Dict[str, Any] = {
-            "coin_id": coin_id,
-        }
+        self,
+        coin_id: str,
+        recovery_list_hash: Optional[str],
+        metadata: Optional[Dict[str, Any]],
+        num_verification: Optional[int],
+    ) -> Dict[str, Any]:
+        request: Dict[str, Any] = {"coin_id": coin_id}
         if recovery_list_hash is not None:
             request["recovery_list_hash"] = recovery_list_hash
         if metadata is not None:
         @@@ -521,12 -521,12 +513,8 @@@
         response = await self.fetch("did_find_lost_did", request)
         return response
-    async def create_new_did_wallet_from_recovery(self, filename: str) -> Dict:
-        request: Dict[str, Any] = {
-            "wallet_type": "did_wallet",
-            "did_type": "recovery",
-            "filename": filename,
-        }
+    async def create_new_did_wallet_from_recovery(self, filename: str) -> Dict[str, Any]:
+        request = {"wallet_type": "did_wallet", "did_type": "recovery", "filename": filename}
         response = await self.fetch("create_new_wallet", request)
         return response
         @@@ -539,8 -539,8 +527,8 @@@
         file_name: str,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
-    ) -> Dict:
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_id": wallet_id,
             "coin_name": coin_name,
             "pubkey": pubkey,
         @@@ -552,11 -552,11 +540,8 @@@
         response = await self.fetch("did_create_attest", request)
         return response
-    async def did_recovery_spend(self, wallet_id: int, attest_filenames: str) -> Dict:
-        request: Dict[str, Any] = {
-            "wallet_id": wallet_id,
-            "attest_filenames": attest_filenames,
-        }
+    async def did_recovery_spend(self, wallet_id: int, attest_filenames: str) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id, "attest_filenames": attest_filenames}
         response = await self.fetch("did_recovery_spend", request)
         return response
         @@@ -570,7 -570,7 +555,7 @@@
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
-    ) -> Dict:
+    ) -> Dict[str, Any]:
         request: Dict[str, Any] = {
             "wallet_id": wallet_id,
             "inner_address": address,
         @@@ -584,12 -584,12 +569,12 @@@
         response = await self.fetch("did_transfer_did", request)
         return response
-    async def did_set_wallet_name(self, wallet_id: int, name: str) -> Dict:
+    async def did_set_wallet_name(self, wallet_id: int, name: str) -> Dict[str, Any]:
         request = {"wallet_id": wallet_id, "name": name}
         response = await self.fetch("did_set_wallet_name", request)
         return response
-    async def did_get_wallet_name(self, wallet_id: int) -> Dict:
+    async def did_get_wallet_name(self, wallet_id: int) -> Dict[str, Any]:
         request = {"wallet_id": wallet_id}
         response = await self.fetch("did_get_wallet_name", request)
         return response
         @@@ -609,7 -609,7 +594,7 @@@
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
     ) -> TransactionRecord:
-        request: Dict[str, Any] = {
+        request = {
             "wallet_type": "pool_wallet",
             "mode": mode,
             "initial_target_state": {
         @@@ -629,14 -629,14 +614,14 @@@
         res = await self.fetch("create_new_wallet", request)
         return TransactionRecord.from_json_dict(res["transaction"])
-    async def pw_self_pool(self, wallet_id: int, fee: uint64) -> Dict:
+    async def pw_self_pool(self, wallet_id: int, fee: uint64) -> Dict[str, Any]:
         reply = await self.fetch("pw_self_pool", {"wallet_id": wallet_id, "fee": fee})
         reply = parse_result_transactions(reply)
         return reply
     async def pw_join_pool(
         self, wallet_id: int, target_puzzlehash: bytes32, pool_url: str, relative_lock_height: uint32, fee: uint64
-    ) -> Dict:
+    ) -> Dict[str, Any]:
         request = {
             "wallet_id": int(wallet_id),
             "target_puzzlehash": target_puzzlehash.hex(),
         @@@ -644,14 -644,14 +629,13 @@@
             "pool_url": pool_url,
             "fee": fee,
         }
         reply = await self.fetch("pw_join_pool", request)
         reply = parse_result_transactions(reply)
         return reply
     async def pw_absorb_rewards(
         self, wallet_id: int, fee: uint64 = uint64(0), max_spends_in_tx: Optional[int] = None
-    ) -> Dict:
+    ) -> Dict[str, Any]:
         reply = await self.fetch(
             "pw_absorb_rewards", {"wallet_id": wallet_id, "fee": fee, "max_spends_in_tx": max_spends_in_tx}
         )
         @@@ -667,38 -667,38 +651,27 @@@
         )
     # CATS
-    async def create_new_cat_and_wallet(self, amount: uint64, fee: uint64 = uint64(0), test: bool = False) -> Dict:
-        request: Dict[str, Any] = {
-            "wallet_type": "cat_wallet",
-            "mode": "new",
-            "amount": amount,
-            "fee": fee,
-            "test": test,
-        }
+    async def create_new_cat_and_wallet(
+        self, amount: uint64, fee: uint64 = uint64(0), test: bool = False
+    ) -> Dict[str, Any]:
+        request = {"wallet_type": "cat_wallet", "mode": "new", "amount": amount, "fee": fee, "test": test}
         return await self.fetch("create_new_wallet", request)
-    async def create_wallet_for_existing_cat(self, asset_id: bytes) -> Dict:
-        request: Dict[str, Any] = {
-            "wallet_type": "cat_wallet",
-            "asset_id": asset_id.hex(),
-            "mode": "existing",
-        }
+    async def create_wallet_for_existing_cat(self, asset_id: bytes) -> Dict[str, Any]:
+        request = {"wallet_type": "cat_wallet", "asset_id": asset_id.hex(), "mode": "existing"}
         return await self.fetch("create_new_wallet", request)
     async def get_cat_asset_id(self, wallet_id: int) -> bytes32:
-        request: Dict[str, Any] = {
-            "wallet_id": wallet_id,
-        }
+        request = {"wallet_id": wallet_id}
         return bytes32.from_hexstr((await self.fetch("cat_get_asset_id", request))["asset_id"])
-    async def get_stray_cats(self) -> Dict:
+    async def get_stray_cats(self) -> List[Dict[str, Any]]:
         response = await self.fetch("get_stray_cats", {})
-        return response["stray_cats"]
+        # TODO: casting due to lack of type checked deserialization
+        return cast(List[Dict[str, Any]], response["stray_cats"])
     async def cat_asset_id_to_name(self, asset_id: bytes32) -> Optional[Tuple[Optional[uint32], str]]:
-        request: Dict[str, Any] = {
-            "asset_id": asset_id.hex(),
-        }
+        request = {"asset_id": asset_id.hex()}
         try:
             res = await self.fetch("cat_asset_id_to_name", request)
         except ValueError:
         @@@ -708,10 -708,10 +681,10 @@@
         return wallet_id, res["name"]
     async def get_cat_name(self, wallet_id: int) -> str:
-        request: Dict[str, Any] = {
-            "wallet_id": wallet_id,
-        }
-        return (await self.fetch("cat_get_name", request))["name"]
+        request = {"wallet_id": wallet_id}
+        response = await self.fetch("cat_get_name", request)
+        # TODO: casting due to lack of type checked deserialization
+        return cast(str, response["name"])
     async def set_cat_name(self, wallet_id: int, name: str) -> None:
         request: Dict[str, Any] = {
         @@@ -735,10 -735,10 +708,10 @@@
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
     ) -> TransactionRecord:
-        send_dict: Dict[str, Any] = {
+        send_dict = {
             "wallet_id": wallet_id,
             "fee": fee,
-            "memos": memos if memos else [],
+            "memos": memos if memos is not None else [],
             "extra_conditions": conditions_to_json_dicts(extra_conditions),
             "push": push,
             **tx_config.to_json_dict(),
         @@@ -770,9 -770,9 +743,9 @@@
         self,
         offer_dict: Dict[Union[uint32, str], int],
         tx_config: TXConfig,
-        driver_dict: Dict[str, Any] = None,
-        solver: Dict[str, Any] = None,
-        fee=uint64(0),
+        driver_dict: Optional[Dict[str, Any]] = None,
+        solver: Optional[Dict[str, Any]] = None,
+        fee: int = 0,
         validate_only: bool = False,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         @@@ -810,8 -810,8 +783,8 @@@
         self,
         offer: Offer,
         tx_config: TXConfig,
-        solver: Dict[str, Any] = None,
-        fee=uint64(0),
+        solver: Optional[Dict[str, Any]] = None,
+        fee: int = 0,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
         @@@ -838,7 -838,7 +811,7 @@@
         self,
         start: int = 0,
         end: int = 50,
-        sort_key: str = None,
+        sort_key: Optional[str] = None,
         reverse: bool = False,
         file_contents: bool = False,
         exclude_my_offers: bool = False,
         @@@ -873,12 -873,12 +846,12 @@@
         self,
         trade_id: bytes32,
         tx_config: TXConfig,
-        fee=uint64(0),
+        fee: int = 0,
         secure: bool = True,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
-    ):
+    ) -> None:
         await self.fetch(
             "cancel_offer",
             {
         @@@ -895,7 -895,7 +868,7 @@@
     async def cancel_offers(
         self,
         tx_config: TXConfig,
-        fee=uint64(0),
+        batch_fee: int = 0,
         secure: bool = True,
         batch_size: int = 5,
         cancel_all: bool = False,
         @@@ -908,7 -908,7 +881,7 @@@
             "cancel_offers",
             {
                 "secure": secure,
-                "batch_fee": fee,
+                "batch_fee": batch_fee,
                 "secure": secure,
                 "batch_size": batch_size,
                 "cancel_all": cancel_all,
         @@@ -921,36 -921,36 +894,32 @@@
         )
     # NFT wallet
-    async def create_new_nft_wallet(self, did_id, name=None) -> dict[str, Any]:
-        request: Dict[str, Any] = {
-            "wallet_type": "nft_wallet",
-            "did_id": did_id,
-            "name": name,
-        }
+    async def create_new_nft_wallet(self, did_id: Optional[str], name: Optional[str] = None) -> Dict[str, Any]:
+        request = {"wallet_type": "nft_wallet", "did_id": did_id, "name": name}
         response = await self.fetch("create_new_wallet", request)
         return response
     async def mint_nft(
         self,
-        wallet_id,
-        royalty_address,
-        target_address,
-        hash,
-        uris,
+        wallet_id: int,
+        royalty_address: Optional[str],
+        target_address: Optional[str],
+        hash: str,
+        uris: List[str],
         tx_config: TXConfig,
-        meta_hash="",
-        meta_uris=[],
-        license_hash="",
-        license_uris=[],
-        edition_total=1,
-        edition_number=1,
-        fee=0,
-        royalty_percentage=0,
-        did_id=None,
+        meta_hash: Optional[str] = "",
+        meta_uris: List[str] = [],
+        license_hash: Optional[str] = "",
+        license_uris: List[str] = [],
+        edition_total: Optional[int] = 1,
+        edition_number: Optional[int] = 1,
+        fee: int = 0,
+        royalty_percentage: int = 0,
+        did_id: Optional[str] = None,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
-    ):
+    ) -> Dict[str, Any]:
         request: Dict[str, Any] = {
             "wallet_id": wallet_id,
             "royalty_address": royalty_address,
         @@@ -976,16 -976,16 +945,16 @@@
     async def add_uri_to_nft(
         self,
-        wallet_id,
-        nft_coin_id,
-        key,
-        uri,
-        fee,
+        wallet_id: int,
+        nft_coin_id: str,
+        key: str,
+        uri: str,
+        fee: int,
         tx_config: TXConfig,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
-    ):
+    ) -> Dict[str, Any]:
         request: Dict[str, Any] = {
             "wallet_id": wallet_id,
             "nft_coin_id": nft_coin_id,
         @@@ -1004,8 -1004,8 +973,8 @@@
         self,
         royalty_assets_dict: Dict[Any, Tuple[Any, uint16]],
         fungible_asset_dict: Dict[Any, uint64],
-    ) -> Dict[Any, List[Dict[str, Any]]]:
-        request: Dict[str, Any] = {
+    ) -> Dict[str, List[Dict[str, Any]]]:
+        request = {
             "royalty_assets": [
                 {"asset": id, "royalty_address": royalty_info[0], "royalty_percentage": royalty_info[1]}
                 for id, royalty_info in royalty_assets_dict.items()
         @@@ -1016,22 -1016,22 +985,22 @@@
         del response["success"]
         return response
-    async def get_nft_info(self, coin_id: str, latest: bool = True):
-        request: Dict[str, Any] = {"coin_id": coin_id, "latest": latest}
+    async def get_nft_info(self, coin_id: str, latest: bool = True) -> Dict[str, Any]:
+        request = {"coin_id": coin_id, "latest": latest}
         response = await self.fetch("nft_get_info", request)
         return response
     async def transfer_nft(
         self,
-        wallet_id,
-        nft_coin_id,
-        target_address,
-        fee,
+        wallet_id: int,
+        nft_coin_id: str,
+        target_address: str,
+        fee: int,
         tx_config: TXConfig,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
-    ):
+    ) -> Dict[str, Any]:
         request: Dict[str, Any] = {
             "wallet_id": wallet_id,
             "nft_coin_id": nft_coin_id,
         @@@ -1045,27 -1045,27 +1014,27 @@@
         response = await self.fetch("nft_transfer_nft", request)
         return response
-    async def count_nfts(self, wallet_id: Optional[int]):
-        request: Dict[str, Any] = {"wallet_id": wallet_id}
+    async def count_nfts(self, wallet_id: Optional[int]) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id}
         response = await self.fetch("nft_count_nfts", request)
         return response
-    async def list_nfts(self, wallet_id, num: int = 50, start_index: int = 0):
-        request: Dict[str, Any] = {"wallet_id": wallet_id, "num": num, "start_index": start_index}
+    async def list_nfts(self, wallet_id: int, num: int = 50, start_index: int = 0) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id, "num": num, "start_index": start_index}
         response = await self.fetch("nft_get_nfts", request)
         return response
     async def set_nft_did(
         self,
-        wallet_id,
-        did_id,
-        nft_coin_id,
-        fee,
+        wallet_id: int,
+        did_id: str,
+        nft_coin_id: str,
+        fee: int,
         tx_config: TXConfig,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = True,
-    ):
+    ) -> Dict[str, Any]:
         request: Dict[str, Any] = {
             "wallet_id": wallet_id,
             "did_id": did_id,
         @@@ -1079,8 -1079,8 +1048,8 @@@
         response = await self.fetch("nft_set_nft_did", request)
         return response
-    async def get_nft_wallet_did(self, wallet_id) -> dict[str, Optional[str]]:
-        request: Dict[str, Any] = {"wallet_id": wallet_id}
+    async def get_nft_wallet_did(self, wallet_id: int) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id}
         response = await self.fetch("nft_get_wallet_did", request)
         return response
         @@@ -1094,17 -1094,17 +1063,17 @@@
         target_list: Optional[List[str]] = None,
         mint_number_start: Optional[int] = 1,
         mint_total: Optional[int] = None,
-        xch_coins: Optional[List[Dict]] = None,
+        xch_coins: Optional[List[Dict[str, Any]]] = None,
         xch_change_target: Optional[str] = None,
         new_innerpuzhash: Optional[str] = None,
-        did_coin: Optional[Dict] = None,
+        did_coin: Optional[Dict[str, Any]] = None,
         did_lineage_parent: Optional[str] = None,
         mint_from_did: Optional[bool] = False,
         fee: Optional[int] = 0,
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
         push: bool = False,
-    ) -> Dict:
+    ) -> Dict[str, Any]:
         request = {
             "wallet_id": wallet_id,
             "metadata_list": metadata_list,
         @@@ -1143,21 -1143,21 +1112,17 @@@
             **timelock_info.to_json_dict(),
         }
         response = await self.fetch("create_new_dl", request)
-        txs: List[TransactionRecord] = [
-            TransactionRecord.from_json_dict_convenience(tx) for tx in response["transactions"]
-        ]
-        launcher_id: bytes32 = bytes32.from_hexstr(response["launcher_id"])
+        txs = [TransactionRecord.from_json_dict_convenience(tx) for tx in response["transactions"]]
+        launcher_id = bytes32.from_hexstr(response["launcher_id"])
         return txs, launcher_id
     async def dl_track_new(self, launcher_id: bytes32) -> None:
         request = {"launcher_id": launcher_id.hex()}
         await self.fetch("dl_track_new", request)
-        return None
     async def dl_stop_tracking(self, launcher_id: bytes32) -> None:
         request = {"launcher_id": launcher_id.hex()}
         await self.fetch("dl_stop_tracking", request)
-        return None
     async def dl_latest_singleton(
         self, launcher_id: bytes32, only_confirmed: bool = False
         @@@ -1195,9 -1195,9 +1160,7 @@@
         extra_conditions: Tuple[Condition, ...] = tuple(),
         timelock_info: ConditionValidTimes = ConditionValidTimes(),
     ) -> List[TransactionRecord]:
-        updates_as_strings: Dict[str, str] = {}
-        for lid, root in update_dictionary.items():
-            updates_as_strings[str(lid)] = str(root)
+        updates_as_strings = {str(lid): str(root) for lid, root in update_dictionary.items()}
         request = {
             "updates": updates_as_strings,
             "extra_conditions": conditions_to_json_dicts(extra_conditions),
         @@@ -1296,11 -1296,11 +1259,13 @@@
         ]
     async def delete_notifications(self, ids: Optional[List[bytes32]] = None) -> bool:
-        request: Dict[str, Any] = {}
+        request = {}
         if ids is not None:
             request["ids"] = [id.hex() for id in ids]
         response = await self.fetch("delete_notifications", request)
-        return response["success"]
+        # TODO: casting due to lack of type checked deserialization
+        result = cast(bool, response["success"])
+        return result
     async def send_notification(
         self,
         @@@ -1345,8 -1345,8 +1310,8 @@@
         fee: uint64 = uint64(0),
         fee_for_cat: uint64 = uint64(0),
         extra_conditions: Tuple[Condition, ...] = tuple(),
-    ) -> Dict:
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_type": "dao_wallet",
             "mode": mode,
             "treasury_id": treasury_id,
         @@@ -1362,19 -1362,19 +1327,13 @@@
         response = await self.fetch("create_new_wallet", request)
         return response
-    async def dao_get_treasury_id(
-        self,
-        wallet_id: int,
-    ) -> Dict:
-        request: Dict[str, Any] = {"wallet_id": wallet_id}
+    async def dao_get_treasury_id(self, wallet_id: int) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id}
         response = await self.fetch("dao_get_treasury_id", request)
         return response
-    async def dao_get_rules(
-        self,
-        wallet_id: int,
-    ) -> Dict:
-        request: Dict[str, Any] = {"wallet_id": wallet_id}
+    async def dao_get_rules(self, wallet_id: int) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id}
         response = await self.fetch("dao_get_rules", request)
         return response
         @@@ -1383,7 -1383,7 +1342,7 @@@
         wallet_id: int,
         proposal_type: str,
         tx_config: TXConfig,
-        additions: Optional[List[Dict]] = None,
+        additions: Optional[List[Dict[str, Any]]] = None,
         amount: Optional[uint64] = None,
         inner_address: Optional[str] = None,
         asset_id: Optional[str] = None,
         @@@ -1392,8 -1392,8 +1351,8 @@@
         new_dao_rules: Optional[Dict[str, Optional[uint64]]] = None,
         fee: uint64 = uint64(0),
         extra_conditions: Tuple[Condition, ...] = tuple(),
-    ) -> Dict:
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_id": wallet_id,
             "proposal_type": proposal_type,
             "additions": additions,
         @@@ -1411,13 -1411,13 +1370,13 @@@
         response = await self.fetch("dao_create_proposal", request)
         return response
-    async def dao_get_proposal_state(self, wallet_id: int, proposal_id: str):
-        request: Dict[str, Any] = {"wallet_id": wallet_id, "proposal_id": proposal_id}
+    async def dao_get_proposal_state(self, wallet_id: int, proposal_id: str) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id, "proposal_id": proposal_id}
         response = await self.fetch("dao_get_proposal_state", request)
         return response
-    async def dao_parse_proposal(self, wallet_id: int, proposal_id: str):
-        request: Dict[str, Any] = {"wallet_id": wallet_id, "proposal_id": proposal_id}
+    async def dao_parse_proposal(self, wallet_id: int, proposal_id: str) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id, "proposal_id": proposal_id}
         response = await self.fetch("dao_parse_proposal", request)
         return response
         @@@ -1430,8 -1430,8 +1389,8 @@@
         is_yes_vote: bool = True,
         fee: uint64 = uint64(0),
         extra_conditions: Tuple[Condition, ...] = tuple(),
-    ):
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_id": wallet_id,
             "proposal_id": proposal_id,
             "vote_amount": vote_amount,
         @@@ -1443,8 -1443,8 +1402,8 @@@
         response = await self.fetch("dao_vote_on_proposal", request)
         return response
-    async def dao_get_proposals(self, wallet_id: int, include_closed: bool = True):
-        request: Dict[str, Any] = {"wallet_id": wallet_id, "include_closed": include_closed}
+    async def dao_get_proposals(self, wallet_id: int, include_closed: bool = True) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id, "include_closed": include_closed}
         response = await self.fetch("dao_get_proposals", request)
         return response
         @@@ -1453,11 -1453,11 +1412,11 @@@
         wallet_id: int,
         proposal_id: str,
         tx_config: TXConfig,
-        self_destruct: bool = None,
+        self_destruct: Optional[bool] = None,
         fee: uint64 = uint64(0),
         extra_conditions: Tuple[Condition, ...] = tuple(),
-    ):
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_id": wallet_id,
             "proposal_id": proposal_id,
             "self_destruct": self_destruct,
         @@@ -1474,8 -1474,8 +1433,8 @@@
         tx_config: TXConfig,
         fee: uint64 = uint64(0),
         extra_conditions: Tuple[Condition, ...] = tuple(),
-    ):
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_id": wallet_id,
             "fee": fee,
             "extra_conditions": list(extra_conditions),
         @@@ -1484,8 -1484,8 +1443,8 @@@
         response = await self.fetch("dao_free_coins_from_finished_proposals", request)
         return response
-    async def dao_get_treasury_balance(self, wallet_id: int):
-        request: Dict[str, Any] = {"wallet_id": wallet_id}
+    async def dao_get_treasury_balance(self, wallet_id: int) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id}
         response = await self.fetch("dao_get_treasury_balance", request)
         return response
         @@@ -1497,8 -1497,8 +1456,8 @@@
         tx_config: TXConfig,
         fee: uint64 = uint64(0),
         extra_conditions: Tuple[Condition, ...] = tuple(),
-    ):
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_id": wallet_id,
             "funding_wallet_id": funding_wallet_id,
             "amount": amount,
         @@@ -1516,8 -1516,8 +1475,8 @@@
         tx_config: TXConfig,
         fee: uint64 = uint64(0),
         extra_conditions: Tuple[Condition, ...] = tuple(),
-    ):
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_id": wallet_id,
             "amount": amount,
             "fee": fee,
         @@@ -1531,11 -1531,11 +1490,11 @@@
         self,
         wallet_id: int,
         tx_config: TXConfig,
-        coins: Optional[List[Dict]] = None,
+        coins: Optional[List[Dict[str, Any]]] = None,
         fee: uint64 = uint64(0),
         extra_conditions: Tuple[Condition, ...] = tuple(),
-    ):
-        request: Dict[str, Any] = {
+    ) -> Dict[str, Any]:
+        request = {
             "wallet_id": wallet_id,
             "coins": coins,
             "fee": fee,
         @@@ -1545,8 -1545,8 +1504,8 @@@
         response = await self.fetch("dao_exit_lockup", request)
         return response
-    async def dao_adjust_filter_level(self, wallet_id: int, filter_level: int):
-        request: Dict[str, Any] = {"wallet_id": wallet_id, "filter_level": filter_level}
+    async def dao_adjust_filter_level(self, wallet_id: int, filter_level: int) -> Dict[str, Any]:
+        request = {"wallet_id": wallet_id, "filter_level": filter_level}
         response = await self.fetch("dao_adjust_filter_level", request)
         return response
         @@@ -1619,7 -1619,7 +1578,7 @@@
     async def vc_get_proofs_for_root(self, root: bytes32) -> Dict[str, Any]:
         response = await self.fetch("vc_get_proofs_for_root", {"root": root.hex()})
-        return response["proofs"]
+        return cast(Dict[str, Any], response["proofs"])
     async def vc_revoke(
         self,

chia/simulator/block_tools.py CHANGED Viewed

         @@@ -981,8 -981,8 +981,8 @@@ class BlockTools
                 pending_ses = True
                 ses_hash: Optional[bytes32] = sub_epoch_summary.get_hash()
                 # if the last block is the last block of the epoch, we set the new sub-slot iters and difficulty
-                new_sub_slot_iters: Optional[uint64] = sub_epoch_summary.new_sub_slot_iters
-                new_difficulty: Optional[uint64] = sub_epoch_summary.new_difficulty
+                new_sub_slot_iters: Optional[uint64] = uint64.construct_optional(sub_epoch_summary.new_sub_slot_iters)
+                new_difficulty: Optional[uint64] = uint64.construct_optional(sub_epoch_summary.new_difficulty)
                 self.log.info(f"Sub epoch summary: {sub_epoch_summary} for block {latest_block.height+1}")
             else:  # the previous block is not the last block of the sub-epoch or epoch
         @@@ -1252,8 -1252,8 +1252,8 @@@
                 num_empty_slots_added += 1
             if new_sub_slot_iters is not None and new_difficulty is not None:  # new epoch
-                sub_slot_iters = new_sub_slot_iters
-                difficulty = new_difficulty
+                sub_slot_iters = uint64(new_sub_slot_iters)
+                difficulty = uint64(new_difficulty)
     def create_genesis_block(
         self,
         @@@ -1350,7 -1350,7 +1350,7 @@@
                             cc_challenge,
                             ip_iters,
                         )
-                        cc_ip_vdf = replace(cc_ip_vdf, number_of_iterations=ip_iters)
+                        cc_ip_vdf = cc_ip_vdf.replace(number_of_iterations=ip_iters)
                         rc_ip_vdf, rc_ip_proof = get_vdf_info_and_proof(
                             constants,
                             ClassgroupElement.get_default_element(),
         @@@ -1421,7 -1421,7 +1421,7 @@@
                         + calculate_sp_iters(
                             self.constants,
                             self.constants.SUB_SLOT_ITERS_STARTING,
-                            unfinished_block.reward_chain_block.signage_point_index,
+                            uint8(unfinished_block.reward_chain_block.signage_point_index),
                         )
                     )
                     return unfinished_block_to_full_block(
         @@@ -1552,7 -1552,7 +1552,7 @@@ def get_signage_point
         rc_vdf_challenge,
         rc_vdf_iters,
     )
-    cc_sp_vdf = replace(cc_sp_vdf, number_of_iterations=sp_iters)
+    cc_sp_vdf = cc_sp_vdf.replace(number_of_iterations=sp_iters)
     if normalized_to_identity_cc_sp:
         _, cc_sp_proof = get_vdf_info_and_proof(
             constants,
         @@@ -1597,7 -1597,7 +1597,7 @@@ def finish_block
         cc_vdf_challenge,
         new_ip_iters,
     )
-    cc_ip_vdf = replace(cc_ip_vdf, number_of_iterations=ip_iters)
+    cc_ip_vdf = cc_ip_vdf.replace(number_of_iterations=ip_iters)
     if normalized_to_identity_cc_ip:
         _, cc_ip_proof = get_vdf_info_and_proof(
             constants,
         @@@ -1750,7 -1750,7 +1750,7 @@@ def get_icc
     if len(finished_sub_slots) == 0:
         prev_deficit = latest_block.deficit
     else:
-        prev_deficit = finished_sub_slots[-1].reward_chain.deficit
+        prev_deficit = uint8(finished_sub_slots[-1].reward_chain.deficit)
     if deficit == prev_deficit == constants.MIN_BLOCKS_PER_CHALLENGE_BLOCK:
         # new slot / overflow sb to new slot / overflow sb
         @@@ -2051,7 -2051,7 +2051,7 @@@ def create_block_tools
 def make_unfinished_block(block: FullBlock, constants: ConsensusConstants) -> UnfinishedBlock:
-    if is_overflow_block(constants, block.reward_chain_block.signage_point_index):
+    if is_overflow_block(constants, uint8(block.reward_chain_block.signage_point_index)):
         finished_ss = block.finished_sub_slots[:-1]
     else:
         finished_ss = block.finished_sub_slots

chia/timelord/iters_from_block.py CHANGED Viewed

         @@@ -7,7 -7,7 +7,7 @@@ from chia.consensus.pot_iterations impo
 from chia.types.blockchain_format.proof_of_space import verify_and_get_quality_string
 from chia.types.blockchain_format.reward_chain_block import RewardChainBlock, RewardChainBlockUnfinished
 from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32, uint64
+from chia.util.ints import uint8, uint32, uint64
 def iters_from_block(
         @@@ -40,11 -40,11 +40,11 @@@
         cc_sp,
     )
     return (
-        calculate_sp_iters(constants, sub_slot_iters, reward_chain_block.signage_point_index),
+        calculate_sp_iters(constants, sub_slot_iters, uint8(reward_chain_block.signage_point_index)),
         calculate_ip_iters(
             constants,
             sub_slot_iters,
-            reward_chain_block.signage_point_index,
+            uint8(reward_chain_block.signage_point_index),
             required_iters,
         ),
     )

chia/timelord/timelord.py CHANGED Viewed

         @@@ -256,7 -256,7 +256,7 @@@ class Timelord
             log.warning(f"Received invalid unfinished block: {e}.")
             return None
         block_sp_total_iters = self.last_state.total_iters - ip_iters + block_sp_iters
-        if is_overflow_block(self.constants, block.reward_chain_block.signage_point_index):
+        if is_overflow_block(self.constants, uint8(block.reward_chain_block.signage_point_index)):
             block_sp_total_iters -= self.last_state.get_sub_slot_iters()
         found_index = -1
         for index, (rc, total_iters) in enumerate(self.last_state.reward_challenge_cache):
         @@@ -279,7 -279,7 +279,7 @@@
                 )
                 return None
             if self.last_state.reward_challenge_cache[found_index][1] > block_sp_total_iters:
-                if not is_overflow_block(self.constants, block.reward_chain_block.signage_point_index):
+                if not is_overflow_block(self.constants, uint8(block.reward_chain_block.signage_point_index)):
                     log.error(
                         f"Will not infuse unfinished block {block.rc_prev}, sp total iters: {block_sp_total_iters}, "
                         f"because its iters are too low"
         @@@ -485,13 -485,13 +485,13 @@@
                 rc_challenge = self.last_state.get_challenge(Chain.REWARD_CHAIN)
                 if rc_info.challenge != rc_challenge:
                     assert rc_challenge is not None
-                    log.warning(f"SP: Do not have correct challenge {rc_challenge.hex()} has {rc_info.challenge}")
+                    log.warning(f"SP: Do not have correct challenge {rc_challenge.hex()} has {rc_info.challenge.hex()}")
                     # This proof is on an outdated challenge, so don't use it
                     continue
                 iters_from_sub_slot_start = uint64(cc_info.number_of_iterations + self.last_state.get_last_ip())
                 response = timelord_protocol.NewSignagePointVDF(
                     signage_point_index,
-                    dataclasses.replace(cc_info, number_of_iterations=iters_from_sub_slot_start),
+                    cc_info.replace(number_of_iterations=iters_from_sub_slot_start),
                     cc_proof,
                     rc_info,
                     rc_proof,
         @@@ -584,7 -584,7 +584,7 @@@
                         assert rc_challenge is not None
                         log.warning(
                             f"Do not have correct challenge {rc_challenge.hex()} "
-                            f"has {rc_info.challenge}, partial hash {block.reward_chain_block.get_hash()}"
+                            f"has {rc_info.challenge.hex()}, partial hash {block.reward_chain_block.get_hash()}"
                         )
                         # This proof is on an outdated challenge, so don't use it
                         continue
         @@@ -593,13 -593,13 +593,13 @@@
                     self.last_active_time = time.time()
                     log.debug(f"Generated infusion point for challenge: {challenge} iterations: {iteration}.")
-                    overflow = is_overflow_block(self.constants, block.reward_chain_block.signage_point_index)
+                    overflow = is_overflow_block(self.constants, uint8(block.reward_chain_block.signage_point_index))
                     if not self.last_state.can_infuse_block(overflow):
                         log.warning("Too many blocks, or overflow in new epoch, cannot infuse, discarding")
                         return
-                    cc_info = dataclasses.replace(cc_info, number_of_iterations=ip_iters)
+                    cc_info = cc_info.replace(number_of_iterations=ip_iters)
                     response = timelord_protocol.NewInfusionPointVDF(
                         challenge,
                         cc_info,
         @@@ -628,7 -628,7 +628,7 @@@
                         + calculate_sp_iters(
                             self.constants,
                             block.sub_slot_iters,
-                            block.reward_chain_block.signage_point_index,
+                            uint8(block.reward_chain_block.signage_point_index),
                         )
                         - (block.sub_slot_iters if overflow else 0)
                     )
         @@@ -755,14 -755,14 +755,14 @@@
             rc_challenge = self.last_state.get_challenge(Chain.REWARD_CHAIN)
             if rc_vdf.challenge != rc_challenge:
                 assert rc_challenge is not None
-                log.warning(f"Do not have correct challenge {rc_challenge.hex()} has {rc_vdf.challenge}")
+                log.warning(f"Do not have correct challenge {rc_challenge.hex()} has {rc_vdf.challenge.hex()}")
                 # This proof is on an outdated challenge, so don't use it
                 return
             log.debug("Collected end of subslot vdfs.")
             self.iters_finished.add(iter_to_look_for)
             self.last_active_time = time.time()
             iters_from_sub_slot_start = uint64(cc_vdf.number_of_iterations + self.last_state.get_last_ip())
-            cc_vdf = dataclasses.replace(cc_vdf, number_of_iterations=iters_from_sub_slot_start)
+            cc_vdf = cc_vdf.replace(number_of_iterations=iters_from_sub_slot_start)
             if icc_ip_vdf is not None:
                 if self.last_state.peak is not None:
                     total_iters = (
         @@@ -778,7 -778,7 +778,7 @@@
                     log.error(f"{self.last_state.subslot_end}")
                     assert False
                 assert iters_from_cb <= self.last_state.sub_slot_iters
-                icc_ip_vdf = dataclasses.replace(icc_ip_vdf, number_of_iterations=iters_from_cb)
+                icc_ip_vdf = icc_ip_vdf.replace(number_of_iterations=iters_from_cb)
             icc_sub_slot: Optional[InfusedChallengeChainSubSlot] = (
                 None if icc_ip_vdf is None else InfusedChallengeChainSubSlot(icc_ip_vdf)
         @@@ -1118,7 -1118,7 +1118,7 @@@
                                     ip,
                                     reader,
                                     writer,
-                                    info[1].new_proof_of_time.number_of_iterations,
+                                    uint64(info[1].new_proof_of_time.number_of_iterations),
                                     info[1].header_hash,
                                     info[1].height,
                                     info[1].field_vdf,
         @@@ -1170,7 -1170,7 +1170,7 @@@
                     bluebox_process_data = BlueboxProcessData(
                         picked_info.new_proof_of_time.challenge,
                         uint16(self.constants.DISCRIMINANT_SIZE_BITS),
-                        picked_info.new_proof_of_time.number_of_iterations,
+                        uint64(picked_info.new_proof_of_time.number_of_iterations),
                     )
                     proof = await asyncio.get_running_loop().run_in_executor(
                         pool,

chia/timelord/timelord_state.py CHANGED Viewed

         @@@ -59,13 -59,13 +59,13 @@@ class LastState
                 state.reward_chain_block,
                 state.sub_slot_iters,
                 state.difficulty,
-                state.reward_chain_block.height,
+                uint32(state.reward_chain_block.height),
             )
             self.deficit = state.deficit
             self.sub_epoch_summary = state.sub_epoch_summary
-            self.last_weight = state.reward_chain_block.weight
-            self.last_height = state.reward_chain_block.height
-            self.total_iters = state.reward_chain_block.total_iters
+            self.last_weight = uint128(state.reward_chain_block.weight)
+            self.last_height = uint32(state.reward_chain_block.height)
+            self.total_iters = uint128(state.reward_chain_block.total_iters)
             self.last_peak_challenge = state.reward_chain_block.get_hash()
             self.difficulty = state.difficulty
             self.sub_slot_iters = state.sub_slot_iters
         @@@ -87,11 -87,11 +87,11 @@@
             self.peak = None
             self.subslot_end = state
             self.last_ip = uint64(0)
-            self.deficit = state.reward_chain.deficit
+            self.deficit = uint8(state.reward_chain.deficit)
             if state.challenge_chain.new_difficulty is not None:
                 assert state.challenge_chain.new_sub_slot_iters is not None
-                self.difficulty = state.challenge_chain.new_difficulty
-                self.sub_slot_iters = state.challenge_chain.new_sub_slot_iters
+                self.difficulty = uint64(state.challenge_chain.new_difficulty)
+                self.sub_slot_iters = uint64(state.challenge_chain.new_sub_slot_iters)
                 self.new_epoch = True
             else:
                 self.new_epoch = False

chia/types/blockchain_format/classgroup.py CHANGED Viewed

         @@@ -1,34 -1,34 +1,5 @@@
 from __future__ import annotations
-from dataclasses import dataclass
+from chia_rs import ClassgroupElement
-from chia.types.blockchain_format.sized_bytes import bytes100
-from chia.util.streamable import Streamable, streamable
-@streamable
-@dataclass(frozen=True)
-class ClassgroupElement(Streamable):
-    """
-    Represents a classgroup element (a,b,c) where a, b, and c are 512 bit signed integers. However this is using
-    a compressed representation. VDF outputs are a single classgroup element. VDF proofs can also be one classgroup
-    element (or multiple).
-    """
-    data: bytes100
-    @staticmethod
-    def create(data: bytes) -> ClassgroupElement:
-        if len(data) < 100:
-            data += b"\x00" * (100 - len(data))
-        return ClassgroupElement(bytes100(data))
-    @staticmethod
-    def get_default_element() -> ClassgroupElement:
-        # Bit 3 in the first byte of serialized compressed form indicates if
-        # it's the default generator element.
-        return ClassgroupElement.create(b"\x08")
-    @staticmethod
-    def get_size() -> int:
-        return 100
+__all__ = ["ClassgroupElement"]

chia/types/blockchain_format/foliage.py CHANGED Viewed

         @@@ -1,61 -1,61 +1,8 @@@
 from __future__ import annotations
-from dataclasses import dataclass
-from typing import List, Optional
+import chia_rs
-from chia_rs import G2Element
-from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.pool_target import PoolTarget
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint64
-from chia.util.streamable import Streamable, streamable
-@streamable
-@dataclass(frozen=True)
-class TransactionsInfo(Streamable):
-    # Information that goes along with each transaction block
-    generator_root: bytes32  # sha256 of the block generator in this block
-    generator_refs_root: bytes32  # sha256 of the concatenation of the generator ref list entries
-    aggregated_signature: G2Element
-    fees: uint64  # This only includes user fees, not block rewards
-    cost: uint64  # This is the total cost of this block, including CLVM cost, cost of program size and conditions
-    reward_claims_incorporated: List[Coin]  # These can be in any order
-@streamable
-@dataclass(frozen=True)
-class FoliageTransactionBlock(Streamable):
-    # Information that goes along with each transaction block that is relevant for light clients
-    prev_transaction_block_hash: bytes32
-    timestamp: uint64
-    filter_hash: bytes32
-    additions_root: bytes32
-    removals_root: bytes32
-    transactions_info_hash: bytes32
-@streamable
-@dataclass(frozen=True)
-class FoliageBlockData(Streamable):
-    # Part of the block that is signed by the plot key
-    unfinished_reward_block_hash: bytes32
-    pool_target: PoolTarget
-    pool_signature: Optional[G2Element]  # Iff ProofOfSpace has a pool pk
-    farmer_reward_puzzle_hash: bytes32
-    extension_data: bytes32  # Used for future updates. Can be any 32 byte value initially
-@streamable
-@dataclass(frozen=True)
-class Foliage(Streamable):
-    # The entire foliage block, containing signature and the unsigned back pointer
-    # The hash of this is the "header hash". Note that for unfinished blocks, the prev_block_hash
-    # Is the prev from the signage point, and can be replaced with a more recent block
-    prev_block_hash: bytes32
-    reward_block_hash: bytes32
-    foliage_block_data: FoliageBlockData
-    foliage_block_data_signature: G2Element
-    foliage_transaction_block_hash: Optional[bytes32]
-    foliage_transaction_block_signature: Optional[G2Element]
+TransactionsInfo = chia_rs.TransactionsInfo
+FoliageTransactionBlock = chia_rs.FoliageTransactionBlock
+FoliageBlockData = chia_rs.FoliageBlockData
+Foliage = chia_rs.Foliage

chia/types/blockchain_format/pool_target.py CHANGED Viewed

         @@@ -1,14 -1,14 +1,5 @@@
 from __future__ import annotations
-from dataclasses import dataclass
+import chia_rs
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint32
-from chia.util.streamable import Streamable, streamable
-@streamable
-@dataclass(frozen=True)
-class PoolTarget(Streamable):
-    puzzle_hash: bytes32
-    max_height: uint32  # A max height of 0 means it is valid forever
+PoolTarget = chia_rs.PoolTarget

chia/types/blockchain_format/proof_of_space.py CHANGED Viewed

         @@@ -1,9 -1,9 +1,9 @@@
 from __future__ import annotations
 import logging
-from dataclasses import dataclass
 from typing import Optional, cast
+import chia_rs
 from bitstring import BitArray
 from chia_rs import AugSchemeMPL, G1Element, PrivateKey
 from chiapos import Verifier
         @@@ -11,21 -11,21 +11,11 @@@
 from chia.consensus.constants import ConsensusConstants
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
-from chia.util.ints import uint8, uint32
-from chia.util.streamable import Streamable, streamable
-log = logging.getLogger(__name__)
+from chia.util.ints import uint32
+ProofOfSpace = chia_rs.ProofOfSpace
-@streamable
-@dataclass(frozen=True)
-class ProofOfSpace(Streamable):
-    challenge: bytes32
-    pool_public_key: Optional[G1Element]  # Only one of these two should be present
-    pool_contract_puzzle_hash: Optional[bytes32]
-    plot_public_key: G1Element
-    size: uint8
-    proof: bytes
+log = logging.getLogger(__name__)
 def get_plot_id(pos: ProofOfSpace) -> bytes32:

chia/types/blockchain_format/reward_chain_block.py CHANGED Viewed

         @@@ -1,56 -1,56 +1,6 @@@
 from __future__ import annotations
-from dataclasses import dataclass
-from typing import Optional
+import chia_rs
-from chia_rs import G2Element
-from chia.types.blockchain_format.proof_of_space import ProofOfSpace
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.types.blockchain_format.vdf import VDFInfo
-from chia.util.ints import uint8, uint32, uint128
-from chia.util.streamable import Streamable, streamable
-@streamable
-@dataclass(frozen=True)
-class RewardChainBlockUnfinished(Streamable):
-    total_iters: uint128
-    signage_point_index: uint8
-    pos_ss_cc_challenge_hash: bytes32
-    proof_of_space: ProofOfSpace
-    challenge_chain_sp_vdf: Optional[VDFInfo]  # Not present for first sp in slot
-    challenge_chain_sp_signature: G2Element
-    reward_chain_sp_vdf: Optional[VDFInfo]  # Not present for first sp in slot
-    reward_chain_sp_signature: G2Element
-@streamable
-@dataclass(frozen=True)
-class RewardChainBlock(Streamable):
-    weight: uint128
-    height: uint32
-    total_iters: uint128
-    signage_point_index: uint8
-    pos_ss_cc_challenge_hash: bytes32
-    proof_of_space: ProofOfSpace
-    challenge_chain_sp_vdf: Optional[VDFInfo]  # Not present for first sp in slot
-    challenge_chain_sp_signature: G2Element
-    challenge_chain_ip_vdf: VDFInfo
-    reward_chain_sp_vdf: Optional[VDFInfo]  # Not present for first sp in slot
-    reward_chain_sp_signature: G2Element
-    reward_chain_ip_vdf: VDFInfo
-    infused_challenge_chain_ip_vdf: Optional[VDFInfo]  # Iff deficit < 16
-    is_transaction_block: bool
-    def get_unfinished(self) -> RewardChainBlockUnfinished:
-        return RewardChainBlockUnfinished(
-            self.total_iters,
-            self.signage_point_index,
-            self.pos_ss_cc_challenge_hash,
-            self.proof_of_space,
-            self.challenge_chain_sp_vdf,
-            self.challenge_chain_sp_signature,
-            self.reward_chain_sp_vdf,
-            self.reward_chain_sp_signature,
-        )
+RewardChainBlock = chia_rs.RewardChainBlock
+RewardChainBlockUnfinished = chia_rs.RewardChainBlockUnfinished

chia/types/blockchain_format/serialized_program.py CHANGED Viewed

         @@@ -1,115 -1,115 +1,5 @@@
 from __future__ import annotations
-import io
-from typing import Tuple
+import chia_rs
-from chia_rs import MEMPOOL_MODE, run_chia_program, serialized_length, tree_hash
-from clvm import SExp
-from clvm.SExp import CastableType
-from chia.types.blockchain_format.program import Program
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.byte_types import hexstr_to_bytes
-def _serialize(node: object) -> bytes:
-    if isinstance(node, list):
-        serialized_list = bytearray()
-        for a in node:
-            serialized_list += b"\xff"
-            serialized_list += _serialize(a)
-        serialized_list += b"\x80"
-        return bytes(serialized_list)
-    if type(node) is SerializedProgram:
-        return bytes(node)
-    if type(node) is Program:
-        return bytes(node)
-    else:
-        ret: bytes = SExp.to(node).as_bin()
-        return ret
-class SerializedProgram:
-    """
-    An opaque representation of a clvm program. It has a more limited interface than a full SExp
-    """
-    _buf: bytes
-    def __init__(self, buf: bytes) -> None:
-        assert isinstance(buf, bytes)
-        self._buf = buf
-    @staticmethod
-    def parse(f: io.BytesIO) -> SerializedProgram:
-        length = serialized_length(f.getvalue()[f.tell() :])
-        return SerializedProgram.from_bytes(f.read(length))
-    def stream(self, f: io.BytesIO) -> None:
-        f.write(self._buf)
-    @staticmethod
-    def from_bytes(blob: bytes) -> SerializedProgram:
-        assert serialized_length(blob) == len(blob)
-        return SerializedProgram(bytes(blob))
-    @staticmethod
-    def fromhex(hexstr: str) -> SerializedProgram:
-        return SerializedProgram.from_bytes(hexstr_to_bytes(hexstr))
-    @staticmethod
-    def from_program(p: Program) -> SerializedProgram:
-        return SerializedProgram(bytes(p))
-    @staticmethod
-    def to(o: CastableType) -> SerializedProgram:
-        return SerializedProgram(Program.to(o).as_bin())
-    def to_program(self) -> Program:
-        return Program.from_bytes(self._buf)
-    def uncurry(self) -> Tuple[Program, Program]:
-        return self.to_program().uncurry()
-    def __bytes__(self) -> bytes:
-        return self._buf
-    def __str__(self) -> str:
-        return bytes(self).hex()
-    def __repr__(self) -> str:
-        return f"{self.__class__.__name__}({str(self)})"
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, SerializedProgram):
-            return False
-        return self._buf == other._buf
-    def __ne__(self, other: object) -> bool:
-        if not isinstance(other, SerializedProgram):
-            return True
-        return self._buf != other._buf
-    def get_tree_hash(self) -> bytes32:
-        return bytes32(tree_hash(self._buf))
-    def run_mempool_with_cost(self, max_cost: int, arg: object) -> Tuple[int, Program]:
-        return self._run(max_cost, MEMPOOL_MODE, arg)
-    def run_with_cost(self, max_cost: int, arg: object) -> Tuple[int, Program]:
-        return self._run(max_cost, 0, arg)
-    def _run(self, max_cost: int, flags: int, arg: object) -> Tuple[int, Program]:
-        # when multiple arguments are passed, concatenate them into a serialized
-        # buffer. Some arguments may already be in serialized form (e.g.
-        # SerializedProgram) so we don't want to de-serialize those just to
-        # serialize them back again. This is handled by _serialize()
-        serialized_args = _serialize(arg)
-        cost, ret = run_chia_program(
-            self._buf,
-            bytes(serialized_args),
-            max_cost,
-            flags,
-        )
-        return cost, Program.to(ret)
+SerializedProgram = chia_rs.Program

chia/types/blockchain_format/slots.py CHANGED Viewed

         @@@ -1,54 -1,54 +1,9 @@@
 from __future__ import annotations
-from dataclasses import dataclass
-from typing import Optional
+import chia_rs
-from chia_rs import G2Element
-from chia.types.blockchain_format.proof_of_space import ProofOfSpace
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.types.blockchain_format.vdf import VDFInfo, VDFProof
-from chia.util.ints import uint8, uint64
-from chia.util.streamable import Streamable, streamable
-@streamable
-@dataclass(frozen=True)
-class ChallengeBlockInfo(Streamable):  # The hash of this is used as the challenge_hash for the ICC VDF
-    proof_of_space: ProofOfSpace
-    challenge_chain_sp_vdf: Optional[VDFInfo]  # Only present if not the first sp
-    challenge_chain_sp_signature: G2Element
-    challenge_chain_ip_vdf: VDFInfo
-@streamable
-@dataclass(frozen=True)
-class ChallengeChainSubSlot(Streamable):
-    challenge_chain_end_of_slot_vdf: VDFInfo
-    infused_challenge_chain_sub_slot_hash: Optional[bytes32]  # Only at the end of a slot
-    subepoch_summary_hash: Optional[bytes32]  # Only once per sub-epoch, and one sub-epoch delayed
-    new_sub_slot_iters: Optional[uint64]  # Only at the end of epoch, sub-epoch, and slot
-    new_difficulty: Optional[uint64]  # Only at the end of epoch, sub-epoch, and slot
-@streamable
-@dataclass(frozen=True)
-class InfusedChallengeChainSubSlot(Streamable):
-    infused_challenge_chain_end_of_slot_vdf: VDFInfo
-@streamable
-@dataclass(frozen=True)
-class RewardChainSubSlot(Streamable):
-    end_of_slot_vdf: VDFInfo
-    challenge_chain_sub_slot_hash: bytes32
-    infused_challenge_chain_sub_slot_hash: Optional[bytes32]
-    deficit: uint8  # 16 or less. usually zero
-@streamable
-@dataclass(frozen=True)
-class SubSlotProofs(Streamable):
-    challenge_chain_slot_proof: VDFProof
-    infused_challenge_chain_slot_proof: Optional[VDFProof]
-    reward_chain_slot_proof: VDFProof
+ChallengeBlockInfo = chia_rs.ChallengeBlockInfo
+ChallengeChainSubSlot = chia_rs.ChallengeChainSubSlot
+InfusedChallengeChainSubSlot = chia_rs.InfusedChallengeChainSubSlot
+RewardChainSubSlot = chia_rs.RewardChainSubSlot
+SubSlotProofs = chia_rs.SubSlotProofs

chia/types/blockchain_format/sub_epoch_summary.py CHANGED Viewed

         @@@ -1,18 -1,18 +1,5 @@@
 from __future__ import annotations
-from dataclasses import dataclass
-from typing import Optional
+import chia_rs
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.util.ints import uint8, uint64
-from chia.util.streamable import Streamable, streamable
-@streamable
-@dataclass(frozen=True)
-class SubEpochSummary(Streamable):
-    prev_subepoch_summary_hash: bytes32
-    reward_chain_hash: bytes32  # hash of reward chain at end of last segment
-    num_blocks_overflow: uint8  # How many more blocks than 384*(N-1)
-    new_difficulty: Optional[uint64]  # Only once per epoch (diff adjustment)
-    new_sub_slot_iters: Optional[uint64]  # Only once per epoch (diff adjustment)
+SubEpochSummary = chia_rs.SubEpochSummary

chia/types/blockchain_format/vdf.py CHANGED Viewed

         @@@ -2,21 -2,21 +2,22 @@@ from __future__ import annotation
 import logging
 import traceback
-from dataclasses import dataclass
 from enum import IntEnum
 from functools import lru_cache
 from typing import Optional
+from chia_rs import VDFInfo, VDFProof
 from chiavdf import create_discriminant, verify_n_wesolowski
 from chia.consensus.constants import ConsensusConstants
 from chia.types.blockchain_format.classgroup import ClassgroupElement
 from chia.types.blockchain_format.sized_bytes import bytes32, bytes100
 from chia.util.ints import uint8, uint64
-from chia.util.streamable import Streamable, streamable
 log = logging.getLogger(__name__)
+__all__ = ["VDFInfo", "VDFProof"]
 @lru_cache(maxsize=200)
 def get_discriminant(challenge: bytes32, size_bites: int) -> int:
         @@@ -46,22 -46,22 +47,6 @@@ def verify_vdf
     )
-@streamable
-@dataclass(frozen=True)
-class VDFInfo(Streamable):
-    challenge: bytes32  # Used to generate the discriminant (VDF group)
-    number_of_iterations: uint64
-    output: ClassgroupElement
-@streamable
-@dataclass(frozen=True)
-class VDFProof(Streamable):
-    witness_type: uint8
-    witness: bytes
-    normalized_to_identity: bool
 def validate_vdf(
     proof: VDFProof,
     constants: ConsensusConstants,

chia/types/end_of_slot_bundle.py CHANGED Viewed

         @@@ -1,21 -1,21 +1,5 @@@
 from __future__ import annotations
-from dataclasses import dataclass
-from typing import Optional
+import chia_rs
-from chia.types.blockchain_format.slots import (
-    ChallengeChainSubSlot,
-    InfusedChallengeChainSubSlot,
-    RewardChainSubSlot,
-    SubSlotProofs,
-)
-from chia.util.streamable import Streamable, streamable
-@streamable
-@dataclass(frozen=True)
-class EndOfSubSlotBundle(Streamable):
-    challenge_chain: ChallengeChainSubSlot
-    infused_challenge_chain: Optional[InfusedChallengeChainSubSlot]
-    reward_chain: RewardChainSubSlot
-    proofs: SubSlotProofs
+EndOfSubSlotBundle = chia_rs.EndOfSubSlotBundle

chia/types/full_block.py CHANGED Viewed

         @@@ -39,15 -39,15 +39,15 @@@ class FullBlock(Streamable)
     @property
     def height(self) -> uint32:
-        return self.reward_chain_block.height
+        return uint32(self.reward_chain_block.height)
     @property
     def weight(self) -> uint128:
-        return self.reward_chain_block.weight
+        return uint128(self.reward_chain_block.weight)
     @property
     def total_iters(self) -> uint128:
-        return self.reward_chain_block.total_iters
+        return uint128(self.reward_chain_block.total_iters)
     @property
     def header_hash(self) -> bytes32:

chia/types/header_block.py CHANGED Viewed

         @@@ -38,11 -38,11 +38,11 @@@ class HeaderBlock(Streamable)
     @property
     def height(self) -> uint32:
-        return self.reward_chain_block.height
+        return uint32(self.reward_chain_block.height)
     @property
     def weight(self) -> uint128:
-        return self.reward_chain_block.weight
+        return uint128(self.reward_chain_block.weight)
     @property
     def header_hash(self) -> bytes32:
         @@@ -50,7 -50,7 +50,7 @@@
     @property
     def total_iters(self) -> uint128:
-        return self.reward_chain_block.total_iters
+        return uint128(self.reward_chain_block.total_iters)
     @property
     def log_string(self) -> str:

chia/types/transaction_queue_entry.py CHANGED Viewed

         @@@ -1,6 -1,6 +1,5 @@@
 from __future__ import annotations
-import asyncio
 from dataclasses import dataclass, field
 from typing import Optional, Tuple
         @@@ -9,6 -9,6 +8,7 @@@ from chia.types.blockchain_format.sized
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.spend_bundle import SpendBundle
 from chia.util.errors import Err
+from chia.util.misc import ValuedEvent
 @dataclass(frozen=True)
         @@@ -22,7 -22,7 +22,7 @@@ class TransactionQueueEntry
     spend_name: bytes32
     peer: Optional[WSChiaConnection] = field(compare=False)
     test: bool = field(compare=False)
-    done: asyncio.Future[Tuple[MempoolInclusionStatus, Optional[Err]]] = field(
-        default_factory=asyncio.Future,
+    done: ValuedEvent[Tuple[MempoolInclusionStatus, Optional[Err]]] = field(
+        default_factory=ValuedEvent,
         compare=False,
     )

chia/types/unfinished_block.py CHANGED Viewed

         @@@ -42,4 -42,4 +42,4 @@@ class UnfinishedBlock(Streamable)
     @property
     def total_iters(self) -> uint128:
-        return self.reward_chain_block.total_iters
+        return uint128(self.reward_chain_block.total_iters)

chia/types/unfinished_header_block.py CHANGED Viewed

         @@@ -34,4 -34,4 +34,4 @@@ class UnfinishedHeaderBlock(Streamable)
     @property
     def total_iters(self) -> uint128:
-        return self.reward_chain_block.total_iters
+        return uint128(self.reward_chain_block.total_iters)

chia/types/weight_proof.py CHANGED Viewed

         @@@ -1,26 -1,26 +1,16 @@@
 from __future__ import annotations
 from dataclasses import dataclass
-from typing import List, Optional
+from typing import List
+import chia_rs
-from chia.types.blockchain_format.proof_of_space import ProofOfSpace
 from chia.types.blockchain_format.reward_chain_block import RewardChainBlock
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.types.blockchain_format.vdf import VDFInfo, VDFProof
 from chia.types.end_of_slot_bundle import EndOfSubSlotBundle
 from chia.types.header_block import HeaderBlock
-from chia.util.ints import uint8, uint32, uint64, uint128
 from chia.util.streamable import Streamable, streamable
-@streamable
-@dataclass(frozen=True)
-class SubEpochData(Streamable):
-    reward_chain_hash: bytes32
-    num_blocks_overflow: uint8
-    new_sub_slot_iters: Optional[uint64]
-    new_difficulty: Optional[uint64]
+SubEpochData = chia_rs.SubEpochData
 # number of challenge blocks
 # Average iters for challenge blocks
         @@@ -33,53 -33,53 +23,9 @@@
 # total number of challenge blocks == total number of reward chain blocks
-@streamable
-@dataclass(frozen=True)
-class SubSlotData(Streamable):
-    # if infused
-    proof_of_space: Optional[ProofOfSpace]
-    # VDF to signage point
-    cc_signage_point: Optional[VDFProof]
-    # VDF from signage to infusion point
-    cc_infusion_point: Optional[VDFProof]
-    icc_infusion_point: Optional[VDFProof]
-    cc_sp_vdf_info: Optional[VDFInfo]
-    signage_point_index: Optional[uint8]
-    # VDF from beginning to end of slot if not infused
-    #  from ip to end if infused
-    cc_slot_end: Optional[VDFProof]
-    icc_slot_end: Optional[VDFProof]
-    # info from finished slots
-    cc_slot_end_info: Optional[VDFInfo]
-    icc_slot_end_info: Optional[VDFInfo]
-    cc_ip_vdf_info: Optional[VDFInfo]
-    icc_ip_vdf_info: Optional[VDFInfo]
-    total_iters: Optional[uint128]
-    def is_challenge(self) -> bool:
-        if self.proof_of_space is not None:
-            return True
-        return False
-    def is_end_of_slot(self) -> bool:
-        if self.cc_slot_end_info is not None:
-            return True
-        return False
-@streamable
-@dataclass(frozen=True)
-class SubEpochChallengeSegment(Streamable):
-    sub_epoch_n: uint32
-    sub_slots: List[SubSlotData]
-    rc_slot_end_info: Optional[VDFInfo]  # in first segment of each sub_epoch
-@streamable
-@dataclass(frozen=True)
-# this is used only for serialization to database
-class SubEpochSegments(Streamable):
-    challenge_segments: List[SubEpochChallengeSegment]
+SubEpochChallengeSegment = chia_rs.SubEpochChallengeSegment
+SubEpochSegments = chia_rs.SubEpochSegments
+SubSlotData = chia_rs.SubSlotData
 @streamable

chia/util/full_block_utils.py CHANGED Viewed

         @@@ -1,6 -1,6 +1,5 @@@
 from __future__ import annotations
-import io
 from dataclasses import dataclass
 from typing import Callable, List, Optional, Tuple
         @@@ -298,8 -298,8 +297,7 @@@ def header_block_from_block
             transactions_info_optional = bytes([0])
         else:
             transactions_info_optional = bytes([1])
-            buf3 = buf2[1:]
-            transactions_info = TransactionsInfo.parse(io.BytesIO(buf3))
+            transactions_info, advance = TransactionsInfo.parse_rust(buf2[1:])
         byte_array_tx: List[bytearray] = []
         if is_transaction_block and transactions_info:
             addition_coins = tx_addition_coins + list(transactions_info.reward_claims_incorporated)

chia/util/initial-config.yaml CHANGED Viewed

         @@@ -440,6 -440,6 +440,11 @@@ full_node
   # analyze with chia/utils/profiler.py
   enable_profiler: False
+  # when enabled, each time a block is validated, the python profiler is
+  # engaged. If the validation takes more than 2 seconds, the profile is saved
+  # to disk, in the chia root/block-validation-profile
+  profile_block_validation: False
   enable_memory_profiler: False
   # this is a debug and profiling facility that logs all SQLite commands to a

chia/util/keyring_wrapper.py CHANGED Viewed

         @@@ -2,7 -2,7 +2,7 @@@ from __future__ import annotation
 from pathlib import Path
 from sys import platform
-from typing import Optional, Tuple, Union, overload
+from typing import ClassVar, Optional, Tuple, Union, overload
 from keyring.backends.macOS import Keyring as MacKeyring
 from keyring.backends.Windows import WinVaultKeyring as WinKeyring
         @@@ -63,8 -63,8 +63,8 @@@ class KeyringWrapper
     """
     # Static members
-    __shared_instance = None
-    __keys_root_path: Path = DEFAULT_KEYS_ROOT_PATH
+    __shared_instance: ClassVar[Optional[KeyringWrapper]] = None
+    __keys_root_path: ClassVar[Path] = DEFAULT_KEYS_ROOT_PATH
     # Instance members
     keys_root_path: Path

chia/util/misc.py CHANGED Viewed

         @@@ -13,6 -13,6 +13,7 @@@ from typing import
     Any,
     AsyncContextManager,
     AsyncIterator,
+    ClassVar,
     Collection,
     ContextManager,
     Dict,
         @@@ -374,3 -374,3 +375,27 @@@ async def split_async_manager(manager:
         yield split
     finally:
         await split.exit(if_needed=True)
+class ValuedEventSentinel:
+    pass
+@dataclasses.dataclass
+class ValuedEvent(Generic[T]):
+    _value_sentinel: ClassVar[ValuedEventSentinel] = ValuedEventSentinel()
+    _event: asyncio.Event = dataclasses.field(default_factory=asyncio.Event)
+    _value: Union[ValuedEventSentinel, T] = _value_sentinel
+    def set(self, value: T) -> None:
+        if not isinstance(self._value, ValuedEventSentinel):
+            raise Exception("Value already set")
+        self._value = value
+        self._event.set()
+    async def wait(self) -> T:
+        await self._event.wait()
+        if isinstance(self._value, ValuedEventSentinel):
+            raise Exception("Value not set despite event being set")
+        return self._value

chia/util/profiler.py CHANGED Viewed

         @@@ -5,7 -5,7 +5,9 @@@ import cProfil
 import logging
 import pathlib
 import tracemalloc
+from contextlib import asynccontextmanager
 from datetime import datetime
+from typing import AsyncIterator, Optional
 from chia.util.path import path_from_root
         @@@ -176,3 -176,3 +178,17 @@@ async def mem_profile_task(root_path: p
             counter += 1
     finally:
         tracemalloc.stop()
+@asynccontextmanager
+async def enable_profiler(profile: bool) -> AsyncIterator[Optional[cProfile.Profile]]:
+    if not profile:
+        yield None
+        return
+    # this is not covered by any unit tests as it's essentially test code
+    # itself. It's exercised manually when investigating performance issues
+    with cProfile.Profile() as pr:  # pragma: no cover
+        pr.enable()
+        yield pr
+        pr.disable()

chia/util/recursive_replace.py CHANGED Viewed

         @@@ -7,6 -7,6 +7,16 @@@ from typing import An
 def recursive_replace(root_obj: Any, replace_str: str, replace_with: Any) -> Any:
     split_str = replace_str.split(".")
     if len(split_str) == 1:
-        return replace(root_obj, **{split_str[0]: replace_with})
+        # This check is here to support native types (implemented in Rust
+        # in chia_rs) that aren't dataclasses. They instead implement a
+        # replace() method in their python bindings.
+        if hasattr(root_obj, "replace"):
+            return root_obj.replace(**{split_str[0]: replace_with})
+        else:
+            return replace(root_obj, **{split_str[0]: replace_with})
     sub_obj = recursive_replace(getattr(root_obj, split_str[0]), ".".join(split_str[1:]), replace_with)
-    return replace(root_obj, **{split_str[0]: sub_obj})
+    # See comment above
+    if hasattr(root_obj, "replace"):
+        return root_obj.replace(**{split_str[0]: sub_obj})
+    else:
+        return replace(root_obj, **{split_str[0]: sub_obj})

chia/util/struct_stream.py DELETED Viewed

         @@@ -1,6 -1,6 +1,6 @@@
 from __future__ import annotations
-from typing import BinaryIO, ClassVar, SupportsIndex, SupportsInt, Type, TypeVar, Union
+from typing import BinaryIO, ClassVar, Optional, SupportsIndex, SupportsInt, Type, TypeVar, Union
 from typing_extensions import Protocol
         @@@ -70,6 -70,6 +70,13 @@@ class StructStream(int)
         if not (self.MINIMUM <= self <= self.MAXIMUM):
             raise ValueError(f"Value {self} does not fit into {type(self).__name__}")
+    @classmethod
+    def construct_optional(cls: Type[_T_StructStream], val: Optional[int]) -> Optional[_T_StructStream]:
+        if val is None:
+            return None
+        else:
+            return cls(val)
     @classmethod
     def parse(cls: Type[_T_StructStream], f: BinaryIO) -> _T_StructStream:
         read_bytes = f.read(cls.SIZE)

chia/wallet/block_record.py RENAMED Viewed

         @@@ -1,37 -1,37 +1,0 @@@
-from __future__ import annotations
-from dataclasses import dataclass
-from typing import List
-from chia.types.blockchain_format.coin import Coin
-from chia.types.header_block import HeaderBlock
-from chia.util.streamable import Streamable, streamable
-@streamable
-@dataclass(frozen=True)
-class HeaderBlockRecord(Streamable):
-    """
-    These are values that are stored in the wallet database, corresponding to information
-    that the wallet cares about in each block
-    """
-    header: HeaderBlock
-    additions: List[Coin]  # A block record without additions is not finished
-    removals: List[Coin]  # A block record without removals is not finished
-    @property
-    def header_hash(self):
-        return self.header.header_hash
-    @property
-    def prev_header_hash(self):
-        return self.header.prev_header_hash
-    @property
-    def height(self):
-        return self.header.height
-    @property
-    def transactions_filter(self):
-        return self.header.transactions_filter

chia/wallet/conditions.py CHANGED Viewed

         @@@ -2,7 -2,7 +2,7 @@@ from __future__ import annotation
 from abc import ABC, abstractmethod
 from dataclasses import dataclass, fields, replace
-from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Type, TypeVar, Union, final, get_type_hints
+from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Type, TypeVar, Union, cast, final, get_type_hints
 from chia_rs import G1Element
 from clvm.casts import int_from_bytes, int_to_bytes
         @@@ -733,8 -733,8 +733,8 @@@ class UnknownCondition(Condition)
     args: List[Program]
     def to_program(self) -> Program:
-        prog: Program = self.opcode.cons(self.args)
-        return prog
+        # TODO: Remove cast when we have proper hinting for this
+        return cast(Program, self.opcode.cons(Program.to(self.args)))
     @classmethod
     def from_program(cls, program: Program) -> UnknownCondition:

chia/wallet/did_wallet/did_wallet.py CHANGED Viewed

         @@@ -428,6 -428,6 +428,7 @@@ class DIDWallet
         )
         await self.add_parent(coin.name(), future_parent)
+        await self.wallet_state_manager.add_interested_coin_ids([coin.name()])
     def create_backup(self) -> str:
         """
         @@@ -902,6 -902,6 +903,9 @@@
     ) -> Tuple[TransactionRecord, SpendBundle, str]:
         """
         Create an attestment
+        TODO:
+            1. We should use/respect `tx_config` (reuse_puzhash and co)
+            2. We should take a fee as it's a requirement for every transaction function to do so
         :param recovering_coin_name: Coin ID of the DID
         :param newpuz: New puzzle hash
         :param pubkey: New wallet pubkey
         @@@ -1116,27 -1116,27 +1120,20 @@@
     async def get_new_p2_inner_puzzle(self) -> Program:
         return await self.standard_wallet.get_new_puzzle()
-    async def get_new_did_innerpuz(self, origin_id=None) -> Program:
+    async def get_new_did_innerpuz(self, origin_id: Optional[bytes32] = None) -> Program:
         if self.did_info.origin_coin is not None:
-            innerpuz = did_wallet_puzzles.create_innerpuz(
-                p2_puzzle_or_hash=await self.get_new_p2_inner_puzzle(),
-                recovery_list=self.did_info.backup_ids,
-                num_of_backup_ids_needed=uint64(self.did_info.num_of_backup_ids_needed),
-                launcher_id=self.did_info.origin_coin.name(),
-                metadata=did_wallet_puzzles.metadata_to_program(json.loads(self.did_info.metadata)),
-            )
+            launcher_id = self.did_info.origin_coin.name()
         elif origin_id is not None:
-            innerpuz = did_wallet_puzzles.create_innerpuz(
-                p2_puzzle_or_hash=await self.get_new_p2_inner_puzzle(),
-                recovery_list=self.did_info.backup_ids,
-                num_of_backup_ids_needed=uint64(self.did_info.num_of_backup_ids_needed),
-                launcher_id=origin_id,
-                metadata=did_wallet_puzzles.metadata_to_program(json.loads(self.did_info.metadata)),
-            )
+            launcher_id = origin_id
         else:
             raise ValueError("must have origin coin")
-        return innerpuz
+        return did_wallet_puzzles.create_innerpuz(
+            p2_puzzle_or_hash=await self.get_new_p2_inner_puzzle(),
+            recovery_list=self.did_info.backup_ids,
+            num_of_backup_ids_needed=self.did_info.num_of_backup_ids_needed,
+            launcher_id=launcher_id,
+            metadata=did_wallet_puzzles.metadata_to_program(json.loads(self.did_info.metadata)),
+        )
     async def get_new_did_inner_hash(self) -> bytes32:
         innerpuz = await self.get_new_did_innerpuz()
         @@@ -1366,9 -1366,9 +1363,6 @@@
         unsigned_spend_bundle = SpendBundle(list_of_coinspends, G2Element())
         return await self.sign(unsigned_spend_bundle)
-    async def get_frozen_amount(self) -> uint64:
-        return await self.wallet_state_manager.get_frozen_balance(self.wallet_info.id)
     async def get_spendable_balance(self, unspent_records=None) -> uint128:
         spendable_am = await self.wallet_state_manager.get_confirmed_spendable_balance_for_wallet(
             self.wallet_info.id, unspent_records
         @@@ -1509,7 -1509,7 +1503,7 @@@
         )
         if len(spendable_coins) == 0:
             raise RuntimeError("DID is not currently spendable")
-        return list(spendable_coins)[0].coin
+        return sorted(list(spendable_coins), key=lambda c: c.confirmed_block_height, reverse=True)[0].coin
     async def match_hinted_coin(self, coin: Coin, hint: bytes32) -> bool:
         if self.did_info.origin_coin is None:

chia/wallet/did_wallet/did_wallet_puzzles.py CHANGED Viewed

         @@@ -1,6 -1,6 +1,6 @@@
 from __future__ import annotations
-from typing import Dict, Iterator, List, Optional, Tuple, Union
+from typing import Dict, Iterator, List, Optional, Tuple, Union, cast
 from chia_rs import G1Element
         @@@ -48,7 -48,7 +48,7 @@@ def create_innerpuz
     Note: Receiving a standard P2 puzzle hash wouldn't calculate a valid puzzle, but
     that can be useful if calling `.get_tree_hash_precalc()` on it.
     """
-    backup_ids_hash = Program(Program.to(recovery_list)).get_tree_hash()
+    backup_ids_hash = Program.to(recovery_list).get_tree_hash()
     if recovery_list_hash is not None:
         backup_ids_hash = recovery_list_hash
     singleton_struct = Program.to((SINGLETON_TOP_LAYER_MOD_HASH, (launcher_id, SINGLETON_LAUNCHER_PUZZLE_HASH)))
         @@@ -123,7 -123,7 +123,7 @@@ def create_recovery_message_puzzle(reco
     :param pubkey: New wallet pubkey
     :return: Message puzzle
     """
-    return Program.to(
+    puzzle = Program.to(
         (
             1,
             [
         @@@ -132,6 -132,6 +132,8 @@@
             ],
         )
     )
+    # TODO: Remove cast when we have proper hinting for this
+    return cast(Program, puzzle)
 def create_spend_for_message(
         @@@ -153,7 -153,7 +155,7 @@@
 def match_did_puzzle(mod: Program, curried_args: Program) -> Optional[Iterator[Program]]:
     """
-        Given a puzzle test if it's a DID, if it is, return the curried arguments
+    Given a puzzle test if it's a DID, if it is, return the curried arguments
     :param puzzle: Puzzle
     :return: Curried parameters
     """
         @@@ -161,7 -161,7 +163,8 @@@
         if mod == SINGLETON_TOP_LAYER_MOD:
             mod, curried_args = curried_args.rest().first().uncurry()
             if mod == DID_INNERPUZ_MOD:
-                return curried_args.as_iter()
+                # TODO: Remove cast when we have clvm type hinting for this
+                return cast(Iterator[Program], curried_args.as_iter())
     except Exception:
         import traceback
         @@@ -178,11 -178,11 +181,11 @@@ def check_is_did_puzzle(puzzle: Program
     r = puzzle.uncurry()
     if r is None:
         return False
-    inner_f, args = r
+    inner_f, _ = r
     return is_singleton(inner_f)
-def metadata_to_program(metadata: Dict) -> Program:
+def metadata_to_program(metadata: Dict[str, str]) -> Program:
     """
     Convert the metadata dict to a Chialisp program
     :param metadata: User defined metadata
         @@@ -191,10 -191,10 +194,11 @@@
     kv_list = []
     for key, value in metadata.items():
         kv_list.append((key, value))
-    return Program.to(kv_list)
+    # TODO: Remove cast when we have proper hinting for this
+    return cast(Program, Program.to(kv_list))
-def did_program_to_metadata(program: Program) -> Dict:
+def did_program_to_metadata(program: Program) -> Dict[str, str]:
     """
     Convert a program to a metadata dict
     :param program: Chialisp program contains the metadata

chia/wallet/key_val_store.py CHANGED Viewed

         @@@ -29,14 -29,14 +29,14 @@@ class KeyValStore
         """
         async with self.db_wrapper.reader_no_transaction() as conn:
-            cursor = await conn.execute("SELECT * from key_val_store WHERE key=?", (key,))
+            cursor = await conn.execute("SELECT value from key_val_store WHERE key=?", (key,))
             row = await cursor.fetchone()
             await cursor.close()
         if row is None:
             return None
-        return object_type.from_bytes(row[1])
+        return object_type.from_bytes(row[0])
     async def set_object(self, key: str, obj: Any):
         """

chia/wallet/lineage_proof.py CHANGED Viewed

         @@@ -1,7 -1,7 +1,8 @@@
 from __future__ import annotations
 from dataclasses import dataclass
-from typing import Any, List, Optional
+from enum import Enum
+from typing import Any, Dict, List, Optional
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.sized_bytes import bytes32
         @@@ -9,6 -9,6 +10,12 @@@ from chia.util.ints import uint6
 from chia.util.streamable import Streamable, streamable
+class LineageProofField(Enum):
+    PARENT_NAME = 1
+    INNER_PUZZLE_HASH = 2
+    AMOUNT = 3
 @streamable
 @dataclass(frozen=True)
 class LineageProof(Streamable):
         @@@ -16,6 -16,6 +23,27 @@@
     inner_puzzle_hash: Optional[bytes32] = None
     amount: Optional[uint64] = None
+    @classmethod
+    def from_program(cls, program: Program, fields: List[LineageProofField]) -> LineageProof:
+        lineage_proof_info: Dict[str, Any] = {}
+        field_iter = iter(fields)
+        program_iter = program.as_iter()
+        for program_value in program_iter:
+            field = next(field_iter)
+            if field == LineageProofField.PARENT_NAME:
+                lineage_proof_info["parent_name"] = bytes32(program_value.as_atom())
+            elif field == LineageProofField.INNER_PUZZLE_HASH:
+                lineage_proof_info["inner_puzzle_hash"] = bytes32(program_value.as_atom())
+            elif field == LineageProofField.AMOUNT:
+                lineage_proof_info["amount"] = uint64(program_value.as_int())
+        try:
+            next(field_iter)
+            raise ValueError("Mismatch between program data and fields information")
+        except StopIteration:
+            pass
+        return LineageProof(**lineage_proof_info)
     def to_program(self) -> Program:
         final_list: List[Any] = []
         if self.parent_name is not None:

chia/wallet/puzzles/tails.py CHANGED Viewed

         @@@ -217,7 -217,7 +217,7 @@@ class GenesisByIdOrSingleton(Limitation
     def match(uncurried_mod: Program, curried_args: Program) -> Tuple[bool, List[Program]]:  # pragma: no cover
         if uncurried_mod == GENESIS_BY_ID_OR_SINGLETON_MOD:
             genesis_id = curried_args.first()
-            return True, [genesis_id.as_atom()]
+            return True, [genesis_id]
         else:
             return False, []

chia/wallet/trade_manager.py CHANGED Viewed

         @@@ -540,7 -540,7 +540,7 @@@ class TradeManager
             fee_left_to_pay: uint64 = fee
             # The access of the sorted keys here makes sure we create the XCH transaction first to make sure we pay fee
             # with the XCH side of the offer and don't create an extra fee transaction in other wallets.
-            for id in sorted(coins_to_offer.keys()):
+            for id in sorted(coins_to_offer.keys(), key=lambda id: id != 1):
                 selected_coins = coins_to_offer[id]
                 if isinstance(id, int):
                     wallet = self.wallet_state_manager.wallets[id]

chia/wallet/util/merkle_utils.py CHANGED Viewed

         @@@ -47,6 -47,6 +47,8 @@@ def build_merkle_tree_from_binary_tree(
 def list_to_binary_tree(objects: List[Any]) -> Any:
     size = len(objects)
+    if size == 0:
+        raise ValueError("Cannot build a tree out of 0 objects")
     if size == 1:
         return objects[0]
     midpoint = (size + 1) >> 1

chia/wallet/util/peer_request_cache.py CHANGED Viewed

         @@@ -41,7 -41,7 +41,7 @@@ class PeerRequestCache
         if header_block.is_transaction_block:
             assert header_block.foliage_transaction_block is not None
             if self._timestamps.get(header_block.height) is None:
-                self._timestamps.put(header_block.height, header_block.foliage_transaction_block.timestamp)
+                self._timestamps.put(header_block.height, uint64(header_block.foliage_transaction_block.timestamp))
     def get_block_request(self, start: uint32, end: uint32) -> Optional[asyncio.Task[Any]]:
         return self._block_requests.get((start, end))

chia/wallet/vc_wallet/cr_cat_drivers.py CHANGED Viewed

         @@@ -16,7 -16,7 +16,7 @@@ from chia.util.ints import uint16, uint
 from chia.util.streamable import Streamable, streamable
 from chia.wallet.cat_wallet.cat_utils import CAT_MOD, construct_cat_puzzle
 from chia.wallet.conditions import AssertCoinAnnouncement
-from chia.wallet.lineage_proof import LineageProof
+from chia.wallet.lineage_proof import LineageProof, LineageProofField
 from chia.wallet.payment import Payment
 from chia.wallet.puzzles.load_clvm import load_clvm_maybe_recompile
 from chia.wallet.puzzles.singleton_top_layer_v1_1 import SINGLETON_LAUNCHER_HASH, SINGLETON_MOD_HASH
         @@@ -314,10 -314,10 +314,14 @@@ class CRCAT
         uncurried_puzzle: UncurriedPuzzle = uncurry_puzzle(spend.puzzle_reveal.to_program())
         first_uncurried_cr_layer: UncurriedPuzzle = uncurry_puzzle(uncurried_puzzle.args.at("rrf"))
         second_uncurried_cr_layer: UncurriedPuzzle = uncurry_puzzle(first_uncurried_cr_layer.mod)
+        lineage_proof = LineageProof.from_program(
+            spend.solution.to_program().at("rf"),
+            [LineageProofField.PARENT_NAME, LineageProofField.INNER_PUZZLE_HASH, LineageProofField.AMOUNT],
+        )
         return CRCAT(
             spend.coin,
             bytes32(uncurried_puzzle.args.at("rf").as_atom()),
-            spend.solution.to_program().at("rf"),
+            lineage_proof,
             [bytes32(ap.as_atom()) for ap in second_uncurried_cr_layer.args.at("rf").as_iter()],
             second_uncurried_cr_layer.args.at("rrf"),
             first_uncurried_cr_layer.args.at("rf").get_tree_hash(),
         @@@ -359,6 -359,6 +363,7 @@@
                 raise ValueError(
                     "Previous spend was not a CR-CAT, nor did it properly remark the CR params"
                 )  # pragma: no cover
+            authorized_providers = [bytes32(p.as_atom()) for p in authorized_providers_as_prog.as_iter()]
             lineage_inner_puzhash: bytes32 = potential_cr_layer.get_tree_hash()
         else:
             # Otherwise the info we need will be in the puzzle reveal
         @@@ -369,14 -369,14 +374,14 @@@
             if conditions is None:
                 conditions = inner_puzzle.run(inner_solution)
             inner_puzzle_hash: bytes32 = inner_puzzle.get_tree_hash()
+            authorized_providers = [bytes32(p.as_atom()) for p in authorized_providers_as_prog.as_iter()]
             lineage_inner_puzhash = construct_cr_layer(
-                authorized_providers_as_prog,
+                authorized_providers,
                 proofs_checker,
                 inner_puzzle_hash,  # type: ignore
             ).get_tree_hash_precalc(inner_puzzle_hash)
         # Convert all of the old stuff into python
-        authorized_providers: List[bytes32] = [bytes32(p.as_atom()) for p in authorized_providers_as_prog.as_iter()]
         new_lineage_proof: LineageProof = LineageProof(
             parent_spend.coin.parent_coin_info,
             lineage_inner_puzhash,

chia/wallet/vc_wallet/vc_drivers.py CHANGED Viewed

         @@@ -237,16 -237,16 +237,10 @@@ def create_eml_covenant_morpher
 def construct_exigent_metadata_layer(
-    metadata: Optional[bytes32],
-    transfer_program: Program,
-    inner_puzzle: Program,
+    metadata: Optional[Program], transfer_program: Program, inner_puzzle: Program
 ) -> Program:
     return EXTIGENT_METADATA_LAYER.curry(
-        EXTIGENT_METADATA_LAYER_HASH,
-        metadata,
-        transfer_program,
-        transfer_program.get_tree_hash(),
-        inner_puzzle,
+        EXTIGENT_METADATA_LAYER_HASH, metadata, transfer_program, transfer_program.get_tree_hash(), inner_puzzle
     )

chia/wallet/wallet_blockchain.py CHANGED Viewed

         @@@ -99,8 -99,8 +99,8 @@@ class WalletBlockchain(BlockchainInterf
             and block.finished_sub_slots[0].challenge_chain.new_sub_slot_iters is not None
         ):
             assert block.finished_sub_slots[0].challenge_chain.new_difficulty is not None  # They both change together
-            sub_slot_iters: uint64 = block.finished_sub_slots[0].challenge_chain.new_sub_slot_iters
-            difficulty: uint64 = block.finished_sub_slots[0].challenge_chain.new_difficulty
+            sub_slot_iters = uint64(block.finished_sub_slots[0].challenge_chain.new_sub_slot_iters)
+            difficulty = uint64(block.finished_sub_slots[0].challenge_chain.new_difficulty)
         else:
             sub_slot_iters = self._sub_slot_iters
             difficulty = self._difficulty
         @@@ -164,7 -164,7 +164,7 @@@
         if timestamp is not None:
             self._latest_timestamp = timestamp
         elif block.foliage_transaction_block is not None:
-            self._latest_timestamp = block.foliage_transaction_block.timestamp
+            self._latest_timestamp = uint64(block.foliage_transaction_block.timestamp)
         log.info(f"Peak set to: {self._peak.height} timestamp: {self._latest_timestamp}")
     async def get_peak_block(self) -> Optional[HeaderBlock]:

chia/wallet/wallet_node.py CHANGED Viewed

         @@@ -1058,7 -1058,7 +1058,7 @@@ class WalletNode
                 self.log.debug(f"get_timestamp_for_height_from_peer use cached block for height {request_height}")
             if block is not None and block.foliage_transaction_block is not None:
-                return block.foliage_transaction_block.timestamp
+                return uint64(block.foliage_transaction_block.timestamp)
             request_height -= 1

install.sh CHANGED Viewed

         @@@ -210,7 -210,7 +210,9 @@@ elif [ "$(uname)" = "Linux" ]; the
     echo "Installing on Arch Linux."
     case $(uname -m) in
       x86_64|aarch64)
-        sudo pacman ${PACMAN_AUTOMATED} -S --needed git openssl
+        if ! pacman -Qs "^git$" > /dev/null || ! pacman -Qs "^openssl$" > /dev/null ; then
+          sudo pacman ${PACMAN_AUTOMATED} -S --needed git openssl
+        fi
         ;;
       *)
         echo "Incompatible CPU architecture. Must be x86_64 or aarch64."

mypy-exclusions.txt CHANGED Viewed

         @@@ -11,7 -11,7 +11,6 @@@ chia.plotting.manage
 chia.plotting.util
 chia.rpc.rpc_client
 chia.rpc.util
-chia.rpc.wallet_rpc_client
 chia.simulator.full_node_simulator
 chia.simulator.keyring
 chia.simulator.wallet_tools
         @@@ -19,10 -19,10 +18,8 @@@ chia.ssl.create_ss
 chia.timelord.timelord_api
 chia.timelord.timelord_launcher
 chia.types.blockchain_format.program
-chia.wallet.block_record
 chia.wallet.chialisp
 chia.wallet.did_wallet.did_wallet
-chia.wallet.did_wallet.did_wallet_puzzles
 chia.wallet.key_val_store
 chia.wallet.lineage_proof
 chia.wallet.nft_wallet.nft_puzzles
         @@@ -105,25 -105,25 +102,16 @@@ tests.util.test_full_block_util
 tests.util.test_misc
 tests.util.test_network
 tests.util.time_out_assert
-tests.wallet.cat_wallet.test_cat_wallet
-tests.wallet.cat_wallet.test_offer_lifecycle
 tests.wallet.cat_wallet.test_trades
 tests.wallet.did_wallet.test_did
-tests.wallet.nft_wallet.test_nft_wallet
 tests.wallet.rpc.test_wallet_rpc
 tests.wallet.simple_sync.test_simple_sync_protocol
 tests.wallet.sync.test_wallet_sync
-tests.wallet.test_bech32m
 tests.wallet.test_chialisp
-tests.wallet.test_puzzle_store
-tests.wallet.test_singleton
 tests.wallet.test_singleton_lifecycle
 tests.wallet.test_singleton_lifecycle_fast
 tests.wallet.test_taproot
-tests.wallet.test_wallet_blockchain
 tests.wallet.test_wallet_interested_store
 tests.wallet.test_wallet_key_val_store
-tests.wallet.test_wallet_user_store
 tools.analyze-chain
 tools.run_block
-tools.test_full_sync

setup.py CHANGED Viewed

         @@@ -7,14 -7,14 +7,14 @@@ from setuptools import find_packages, s
 dependencies = [
     "aiofiles==23.2.1",  # Async IO for files
-    "anyio==4.1.0",
-    "boto3==1.34.0",  # AWS S3 for DL s3 plugin
+    "anyio==4.2.0",
+    "boto3==1.34.11",  # AWS S3 for DL s3 plugin
     "chiavdf==1.1.1",  # timelord and vdf verification
     "chiabip158==1.3",  # bip158-style wallet filters
     "chiapos==2.0.3",  # proof of space
     "clvm==0.9.8",
     "clvm_tools==0.4.7",  # Currying, Program.to, other conveniences
-    "chia_rs==0.3.3",
+    "chia_rs==0.4.0",
     "clvm-tools-rs==0.1.40",  # Rust implementation of clvm_tools' compiler
     "aiohttp==3.9.1",  # HTTP server for full node rpc
     "aiosqlite==0.19.0",  # asyncio wrapper for sqlite, to store blocks
         @@@ -32,7 -32,7 +32,7 @@@
     "dnspython==2.4.2",  # Query DNS seeds
     "watchdog==2.2.0",  # Filesystem event watching - watches keyring.yaml
     "dnslib==0.9.23",  # dns lib
-    "typing-extensions==4.8.0",  # typing backports like Protocol and TypedDict
+    "typing-extensions==4.9.0",  # typing backports like Protocol and TypedDict
     "zstd==1.5.5.1",
     "packaging==23.2",
     "psutil==5.9.4",
         @@@ -49,25 -49,25 +49,25 @@@ dev_dependencies =
     "diff-cover==8.0.1",
     "pre-commit==3.5.0; python_version < '3.9'",
     "pre-commit==3.6.0; python_version >= '3.9'",
-    "py3createtorrent==1.1.0",
-    "pylint==3.0.2",
-    "pytest==7.4.3",
+    "py3createtorrent==1.2.0",
+    "pylint==3.0.3",
+    "pytest==7.4.4",
     "pytest-cov==4.1.0",
     "pytest-mock==3.12.0",
     "pytest-xdist==3.5.0",
     "pyupgrade==3.15.0",
     "twine==4.0.2",
-    "isort==5.12.0",
-    "flake8==6.1.0",
-    "mypy==1.7.1",
-    "black==23.11.0",
+    "isort==5.13.2",
+    "flake8==7.0.0",
+    "mypy==1.8.0",
+    "black==23.12.1",
     "lxml==4.9.3",
     "aiohttp_cors==0.7.0",  # For blackd
-    "pyinstaller==5.13.0",
-    "types-aiofiles==23.2.0.0",
+    "pyinstaller==6.3.0",
+    "types-aiofiles==23.2.0.20240106",
     "types-cryptography==3.3.23.2",
     "types-pyyaml==6.0.12.12",
-    "types-setuptools==69.0.0.0",
+    "types-setuptools==69.0.0.20240115",
 ]
 legacy_keyring_dependencies = [

tests/blockchain/test_blockchain.py CHANGED Viewed

         @@@ -576,10 -576,10 +576,9 @@@ class TestBlockHeaderValidation
                         block.finished_sub_slots[-1],
                         "infused_challenge_chain",
                         InfusedChallengeChainSubSlot(
-                            replace(
-                                block.finished_sub_slots[
-                                    -1
-                                ].infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf,
+                            block.finished_sub_slots[
+                                -1
+                            ].infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf.replace(
                                 number_of_iterations=uint64(10000000),
                             )
                         ),
         @@@ -594,10 -594,10 +593,9 @@@
                         block.finished_sub_slots[-1],
                         "infused_challenge_chain",
                         InfusedChallengeChainSubSlot(
-                            replace(
-                                block.finished_sub_slots[
-                                    -1
-                                ].infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf,
+                            block.finished_sub_slots[
+                                -1
+                            ].infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf.replace(
                                 output=ClassgroupElement.get_default_element(),
                             )
                         ),
         @@@ -613,11 -613,11 +611,10 @@@
                         block.finished_sub_slots[-1],
                         "infused_challenge_chain",
                         InfusedChallengeChainSubSlot(
-                            replace(
-                                block.finished_sub_slots[
-                                    -1
-                                ].infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf,
-                                challenge=bytes32([0] * 32),
+                            block.finished_sub_slots[
+                                -1
+                            ].infused_challenge_chain.infused_challenge_chain_end_of_slot_vdf.replace(
+                                challenge=bytes32([0] * 32)
                             )
                         ),
                     )
         @@@ -660,8 -660,8 +657,7 @@@
                     new_finished_ss = recursive_replace(
                         block.finished_sub_slots[-1],
                         "challenge_chain",
-                        replace(
-                            block.finished_sub_slots[-1].challenge_chain,
+                        block.finished_sub_slots[-1].challenge_chain.replace(
                             infused_challenge_chain_sub_slot_hash=bytes([1] * 32),
                         ),
                     )
         @@@ -671,8 -671,8 +667,7 @@@
                     new_finished_ss = recursive_replace(
                         block.finished_sub_slots[-1],
                         "challenge_chain",
-                        replace(
-                            block.finished_sub_slots[-1].challenge_chain,
+                        block.finished_sub_slots[-1].challenge_chain.replace(
                             infused_challenge_chain_sub_slot_hash=block.finished_sub_slots[
                                 -1
                             ].infused_challenge_chain.get_hash(),
         @@@ -698,7 -698,7 +693,7 @@@
                 new_finished_ss_bad_rc = recursive_replace(
                     block.finished_sub_slots[-1],
                     "reward_chain",
-                    replace(block.finished_sub_slots[-1].reward_chain, infused_challenge_chain_sub_slot_hash=None),
+                    block.finished_sub_slots[-1].reward_chain.replace(infused_challenge_chain_sub_slot_hash=None),
                 )
                 block_bad = recursive_replace(
                     block, "finished_sub_slots", block.finished_sub_slots[:-1] + [new_finished_ss_bad_rc]
         @@@ -746,7 -746,7 +741,7 @@@
         new_finished_ss = recursive_replace(
             blocks[-1].finished_sub_slots[-1],
             "challenge_chain",
-            replace(blocks[-1].finished_sub_slots[-1].challenge_chain, subepoch_summary_hash=std_hash(b"0")),
+            blocks[-1].finished_sub_slots[-1].challenge_chain.replace(subepoch_summary_hash=std_hash(b"0")),
         )
         block_bad = recursive_replace(
             blocks[-1], "finished_sub_slots", blocks[-1].finished_sub_slots[:-1] + [new_finished_ss]
         @@@ -794,7 -794,7 +789,7 @@@
         new_finished_ss = recursive_replace(
             blocks[-1].finished_sub_slots[-1],
             "reward_chain",
-            replace(blocks[-1].finished_sub_slots[-1].reward_chain, challenge_chain_sub_slot_hash=bytes([3] * 32)),
+            blocks[-1].finished_sub_slots[-1].reward_chain.replace(challenge_chain_sub_slot_hash=bytes([3] * 32)),
         )
         block_1_bad = recursive_replace(
             blocks[-1], "finished_sub_slots", blocks[-1].finished_sub_slots[:-1] + [new_finished_ss]
         @@@ -1040,8 -1040,8 +1035,8 @@@
         new_finished_ss = recursive_replace(
             new_finished_ss,
             "reward_chain",
-            replace(
-                new_finished_ss.reward_chain, challenge_chain_sub_slot_hash=new_finished_ss.challenge_chain.get_hash()
+            new_finished_ss.reward_chain.replace(
+                challenge_chain_sub_slot_hash=new_finished_ss.challenge_chain.get_hash()
             ),
         )
         block_bad = recursive_replace(block, "finished_sub_slots", [new_finished_ss] + block.finished_sub_slots[1:])
         @@@ -1075,8 -1075,8 +1070,7 @@@
                 new_finished_ss = recursive_replace(
                     new_finished_ss,
                     "reward_chain",
-                    replace(
-                        new_finished_ss.reward_chain,
+                    new_finished_ss.reward_chain.replace(
                         challenge_chain_sub_slot_hash=new_finished_ss.challenge_chain.get_hash(),
                     ),
                 )

tests/blockchain/test_lookup_fork_chain.py CHANGED Viewed

         @@@ -5,12 -5,12 +5,12 @@@ from typing import Dict, Lis
 import pytest
-from benchmarks.utils import rand_hash
 from chia.consensus.block_record import BlockRecord
 from chia.consensus.blockchain_interface import BlockchainInterface
 from chia.consensus.find_fork_point import find_fork_point_in_chain, lookup_fork_chain
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.ints import uint32
+from tests.util.benchmarks import rand_hash
 class DummyChain:

tests/build-job-matrix.py CHANGED Viewed

         @@@ -129,8 -129,8 +129,8 @@@ for path in test_paths
     # TODO: design a configurable system for this
     process_count = {
         "macos": {False: 0, True: 4}.get(conf["parallel"], conf["parallel"]),
-        "ubuntu": {False: 0, True: 4}.get(conf["parallel"], conf["parallel"]),
-        "windows": {False: 0, True: 3}.get(conf["parallel"], conf["parallel"]),
+        "ubuntu": {False: 0, True: 6}.get(conf["parallel"], conf["parallel"]),
+        "windows": {False: 0, True: 6}.get(conf["parallel"], conf["parallel"]),
     }
     pytest_parallel_args = {os: f" -n {count}" for os, count in process_count.items()}

tests/cmds/wallet/test_did.py CHANGED Viewed

         @@@ -323,6 -323,6 +323,6 @@@ def test_did_transfer(capsys: object, g
     ]
     run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
     expected_calls: logType = {
-        "did_transfer_did": [(w_id, t_address, "0.5", True, DEFAULT_TX_CONFIG.override(reuse_puzhash=True))],
+        "did_transfer_did": [(w_id, t_address, 500000000000, True, DEFAULT_TX_CONFIG.override(reuse_puzhash=True))],
     }
     test_rpc_clients.wallet_rpc_client.check_log(expected_calls)

tests/cmds/wallet/test_wallet.py CHANGED Viewed

         @@@ -3,6 -3,6 +3,7 @@@ from __future__ import annotation
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Union, cast
+import pkg_resources
 from chia_rs import Coin, G2Element
 from chia.server.outbound_message import NodeType
         @@@ -35,7 -35,7 +36,7 @@@ from tests.cmds.wallet.test_consts impo
     get_bytes32,
 )
-test_offer_file_path: Path = Path("tests") / "cmds" / "wallet" / "test_offer.toffer"
+test_offer_file_path: Path = Path(pkg_resources.resource_filename(__name__, "test_offer.toffer"))
 test_offer_file_name: str = str(test_offer_file_path)
 test_offer_file_bech32: str = open(test_offer_file_name).read()
 test_offer_id: str = "0xdfb7e8643376820ec995b0bcdb3fc1f764c16b814df5e074631263fcf1e00839"
         @@@ -696,6 -696,6 +697,7 @@@ def test_make_offer(capsys: object, get
         "Including Fees: 1 XCH, 1000000000000 mojos",
         "Created offer with ID 0202020202020202020202020202020202020202020202020202020202020202",
     ]
+    run_cli_command_and_assert(capsys, root_dir, command_args[:-4], ["without --override"])
     run_cli_command_and_assert(capsys, root_dir, command_args, assert_list)
     expected_calls: logType = {
         "cat_asset_id_to_name": [(request_cat_id,)],

tests/core/data_layer/test_data_rpc.py CHANGED Viewed

         @@@ -2292,3 -2292,3 +2292,39 @@@ async def test_wallet_log_in_changes_ac
         active_fingerprint = cast(int, (await wallet_rpc_api.get_logged_in_fingerprint(request={}))["fingerprint"])
         assert active_fingerprint == secondary_fingerprint
+@pytest.mark.limit_consensus_modes(reason="does not depend on consensus rules")
+@pytest.mark.anyio
+async def test_mirrors(
+    self_hostname: str, one_wallet_and_one_simulator_services: SimulatorsAndWalletsServices, tmp_path: Path
+) -> None:
+    wallet_rpc_api, full_node_api, wallet_rpc_port, ph, bt = await init_wallet_and_node(
+        self_hostname, one_wallet_and_one_simulator_services
+    )
+    async with init_data_layer(wallet_rpc_port=wallet_rpc_port, bt=bt, db_path=tmp_path) as data_layer:
+        data_rpc_api = DataLayerRpcApi(data_layer)
+        res = await data_rpc_api.create_data_store({})
+        assert res is not None
+        store_id = bytes32(hexstr_to_bytes(res["id"]))
+        await farm_block_check_singleton(data_layer, full_node_api, ph, store_id, wallet=wallet_rpc_api.service)
+        urls = ["http://127.0.0.1/8000", "http://127.0.0.1/8001"]
+        res = await data_rpc_api.add_mirror({"id": store_id.hex(), "urls": urls, "amount": 1, "fee": 1})
+        await farm_block_check_singleton(data_layer, full_node_api, ph, store_id, wallet=wallet_rpc_api.service)
+        mirrors = await data_rpc_api.get_mirrors({"id": store_id.hex()})
+        mirror_list = mirrors["mirrors"]
+        assert len(mirror_list) == 1
+        mirror = mirror_list[0]
+        assert mirror["urls"] == ["http://127.0.0.1/8000", "http://127.0.0.1/8001"]
+        coin_id = mirror["coin_id"]
+        res = await data_rpc_api.delete_mirror({"coin_id": coin_id, "fee": 1})
+        await farm_block_check_singleton(data_layer, full_node_api, ph, store_id, wallet=wallet_rpc_api.service)
+        mirrors = await data_rpc_api.get_mirrors({"id": store_id.hex()})
+        mirror_list = mirrors["mirrors"]
+        assert len(mirror_list) == 0
+        with pytest.raises(RuntimeError, match="URL list can't be empty"):
+            res = await data_rpc_api.add_mirror({"id": store_id.hex(), "urls": [], "amount": 1, "fee": 1})

tests/core/data_layer/test_data_store.py CHANGED Viewed

         @@@ -308,7 -308,7 +308,7 @@@ async def test_get_ancestors_optimized(
         if i > 25 and i <= 200 and random.randint(0, 4):
             is_insert = True
         if i > 200:
-            hint_keys_values = await data_store.get_keys_values_dict(tree_id)
+            hint_keys_values = await data_store.get_keys_values_compressed(tree_id)
             if not deleted_all:
                 while node_count > 0:
                     node_count -= 1
         @@@ -383,7 -383,7 +383,7 @@@ async def test_batch_update(data_store
         batch: List[Dict[str, Any]] = []
         keys_values: Dict[bytes, bytes] = {}
-        hint_keys_values: Optional[Dict[bytes, bytes]] = {} if use_optimized else None
+        hint_keys_values: Optional[Dict[bytes32, bytes32]] = {} if use_optimized else None
         for operation in range(num_batches * num_ops_per_batch):
             [op_type] = random.choices(
                 ["insert", "upsert-insert", "upsert-update", "delete"],
         @@@ -490,7 -490,7 +490,7 @@@ async def test_upsert_ignores_existing_
 ) -> None:
     key = b"key"
     value = b"value1"
-    hint_keys_values: Optional[Dict[bytes, bytes]] = {} if use_optimized else None
+    hint_keys_values: Optional[Dict[bytes32, bytes32]] = {} if use_optimized else None
     await data_store.autoinsert(
         key=key,
         @@@ -643,7 -643,7 +643,7 @@@ async def test_inserting_duplicate_key_
             side=Side.RIGHT,
         )
-    hint_keys_values = await data_store.get_keys_values_dict(tree_id=tree_id)
+    hint_keys_values = await data_store.get_keys_values_compressed(tree_id=tree_id)
     # TODO: more specific exception
     with pytest.raises(Exception):
         await data_store.insert(
         @@@ -691,7 -691,7 +691,7 @@@ async def test_inserting_invalid_length
 async def test_autoinsert_balances_from_scratch(data_store: DataStore, tree_id: bytes32) -> None:
     random = Random()
     random.seed(100, version=2)
-    hint_keys_values: Dict[bytes, bytes] = {}
+    hint_keys_values: Dict[bytes32, bytes32] = {}
     hashes = []
     for i in range(2000):
         @@@ -710,7 -710,7 +710,7 @@@
 async def test_autoinsert_balances_gaps(data_store: DataStore, tree_id: bytes32) -> None:
     random = Random()
     random.seed(101, version=2)
-    hint_keys_values: Dict[bytes, bytes] = {}
+    hint_keys_values: Dict[bytes32, bytes32] = {}
     hashes = []
     for i in range(2000):
         @@@ -749,7 -749,7 +749,7 @@@ async def test_delete_from_left_both_te
     hint_keys_values = None
     if use_hint:
-        hint_keys_values = await data_store.get_keys_values_dict(tree_id=tree_id)
+        hint_keys_values = await data_store.get_keys_values_compressed(tree_id=tree_id)
     expected = Program.to(
         (
         @@@ -789,7 -789,7 +789,7 @@@ async def test_delete_from_left_other_n
     hint_keys_values = None
     if use_hint:
-        hint_keys_values = await data_store.get_keys_values_dict(tree_id=tree_id)
+        hint_keys_values = await data_store.get_keys_values_compressed(tree_id=tree_id)
     expected = Program.to(
         (
         @@@ -827,7 -827,7 +827,7 @@@ async def test_delete_from_right_both_t
     hint_keys_values = None
     if use_hint:
-        hint_keys_values = await data_store.get_keys_values_dict(tree_id=tree_id)
+        hint_keys_values = await data_store.get_keys_values_compressed(tree_id=tree_id)
     expected = Program.to(
         (
         @@@ -867,7 -867,7 +867,7 @@@ async def test_delete_from_right_other_
     hint_keys_values = None
     if use_hint:
-        hint_keys_values = await data_store.get_keys_values_dict(tree_id=tree_id)
+        hint_keys_values = await data_store.get_keys_values_compressed(tree_id=tree_id)
     expected = Program.to(
         (
         @@@ -1208,6 -1208,6 +1208,33 @@@ async def test_kv_diff_2(data_store: Da
     assert diff_3 == set()
+@pytest.mark.anyio
+async def test_kv_diff_3(data_store: DataStore, tree_id: bytes32) -> None:
+    insert_result = await data_store.autoinsert(
+        key=b"000",
+        value=b"000",
+        tree_id=tree_id,
+        status=Status.COMMITTED,
+    )
+    await data_store.delete(tree_id=tree_id, key=b"000", status=Status.COMMITTED)
+    insert_result_2 = await data_store.autoinsert(
+        key=b"000",
+        value=b"001",
+        tree_id=tree_id,
+        status=Status.COMMITTED,
+    )
+    diff_1 = await data_store.get_kv_diff(tree_id, insert_result.node_hash, insert_result_2.node_hash)
+    assert diff_1 == {DiffData(OperationType.DELETE, b"000", b"000"), DiffData(OperationType.INSERT, b"000", b"001")}
+    insert_result_3 = await data_store.upsert(
+        key=b"000",
+        new_value=b"002",
+        tree_id=tree_id,
+        status=Status.COMMITTED,
+    )
+    diff_2 = await data_store.get_kv_diff(tree_id, insert_result_2.node_hash, insert_result_3.node_hash)
+    assert diff_2 == {DiffData(OperationType.DELETE, b"000", b"001"), DiffData(OperationType.INSERT, b"000", b"002")}
 @pytest.mark.anyio
 async def test_rollback_to_generation(data_store: DataStore, tree_id: bytes32) -> None:
     await add_0123_example(data_store, tree_id)

tests/core/full_node/stores/test_coin_store.py CHANGED Viewed

         @@@ -111,7 -111,7 +111,7 @@@ async def test_basic_coin_store(db_vers
                     assert block.foliage_transaction_block is not None
                     await coin_store.new_block(
                         block.height,
-                        block.foliage_transaction_block.timestamp,
+                        uint64(block.foliage_transaction_block.timestamp),
                         block.get_included_reward_coins(),
                         tx_additions,
                         tx_removals,
         @@@ -121,7 -121,7 +121,7 @@@
                         with pytest.raises(Exception):
                             await coin_store.new_block(
                                 block.height,
-                                block.foliage_transaction_block.timestamp,
+                                uint64(block.foliage_transaction_block.timestamp),
                                 block.get_included_reward_coins(),
                                 tx_additions,
                                 tx_removals,
         @@@ -179,7 -179,7 +179,7 @@@ async def test_set_spent(db_version: in
                         assert block.foliage_transaction_block is not None
                         await coin_store.new_block(
                             block.height,
-                            block.foliage_transaction_block.timestamp,
+                            uint64(block.foliage_transaction_block.timestamp),
                             block.get_included_reward_coins(),
                             additions,
                             removals,
         @@@ -227,7 -227,7 +227,7 @@@ async def test_num_unspent(bt: BlockToo
                 additions: List[Coin] = []
                 await coin_store.new_block(
                     block.height,
-                    block.foliage_transaction_block.timestamp,
+                    uint64(block.foliage_transaction_block.timestamp),
                     block.get_included_reward_coins(),
                     additions,
                     removals,
         @@@ -259,7 -259,7 +259,7 @@@ async def test_rollback(db_version: int
                 assert block.foliage_transaction_block is not None
                 await coin_store.new_block(
                     block.height,
-                    block.foliage_transaction_block.timestamp,
+                    uint64(block.foliage_transaction_block.timestamp),
                     block.get_included_reward_coins(),
                     additions,
                     removals,

tests/core/full_node/stores/test_full_node_store.py CHANGED Viewed

         @@@ -114,7 -114,7 +114,9 @@@ async def test_basic_store
     h_hash_1 = bytes32.random(seeded_random)
     assert not store.seen_unfinished_block(h_hash_1)
     assert store.seen_unfinished_block(h_hash_1)
-    store.clear_seen_unfinished_blocks()
+    # this will crowd out h_hash_1
+    for _ in range(store.max_seen_unfinished_blocks):
+        store.seen_unfinished_block(bytes32.random(seeded_random))
     assert not store.seen_unfinished_block(h_hash_1)
     # Add/get unfinished block
         @@@ -501,7 -501,7 +503,7 @@@
         blocks[1].reward_chain_sp_proof,
     )
     assert not store.new_signage_point(
-        blocks[1].reward_chain_block.signage_point_index,
+        uint8(blocks[1].reward_chain_block.signage_point_index),
         blockchain,
         peak,
         uint64(blockchain.block_record(blocks[1].header_hash).sp_sub_slot_total_iters(custom_block_tools.constants)),
         @@@ -803,9 -803,9 +805,9 @@@
         blocks = custom_block_tools.get_consecutive_blocks(2, block_list_input=blocks, guarantee_transaction_block=True)
-        i3 = blocks[-3].reward_chain_block.signage_point_index
-        i2 = blocks[-2].reward_chain_block.signage_point_index
-        i1 = blocks[-1].reward_chain_block.signage_point_index
+        i3 = uint8(blocks[-3].reward_chain_block.signage_point_index)
+        i2 = uint8(blocks[-2].reward_chain_block.signage_point_index)
+        i1 = uint8(blocks[-1].reward_chain_block.signage_point_index)
         if (
             len(blocks[-2].finished_sub_slots) == len(blocks[-1].finished_sub_slots) == 0
             and not is_overflow_block(custom_block_tools.constants, signage_point_index=i2)

tests/core/full_node/test_full_node.py CHANGED Viewed

         @@@ -63,8 -63,8 +63,8 @@@ from tests.conftest import ConsensusMod
 from tests.connection_utils import add_dummy_connection, connect_and_get_peer
 from tests.core.full_node.stores.test_coin_store import get_future_reward_coins
 from tests.core.make_block_generator import make_spend_bundle
-from tests.core.mempool.test_mempool_performance import wallet_height_at_least
 from tests.core.node_height import node_height_at_least
+from tests.util.misc import wallet_height_at_least
 from tests.util.setup_nodes import SimulatorsAndWalletsServices
 from tests.util.time_out_assert import time_out_assert, time_out_assert_custom_interval, time_out_messages
         @@@ -1586,12 -1586,12 +1586,10 @@@ class TestFullNodeProtocol
         # Submit the sub slot, but not the last block
         blocks = bt.get_consecutive_blocks(1, block_list_input=blocks, skip_slots=1, force_overflow=True)
         for ss in blocks[-1].finished_sub_slots:
-            challenge_chain = dataclasses.replace(
-                ss.challenge_chain,
+            challenge_chain = ss.challenge_chain.replace(
                 new_difficulty=20,
             )
-            slot2 = dataclasses.replace(
-                ss,
+            slot2 = ss.replace(
                 challenge_chain=challenge_chain,
             )
             await full_node_1.respond_end_of_sub_slot(fnp.RespondEndOfSubSlot(slot2), peer)

tests/core/full_node/test_subscriptions.py CHANGED Viewed

         @@@ -20,21 -20,21 +20,21 @@@ ph4 = bytes32(b"h" * 32
 def test_has_ph_sub() -> None:
     sub = PeerSubscriptions()
-    assert sub.has_ph_subscription(ph1) is False
-    assert sub.has_ph_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph1) is False
+    assert sub.has_puzzle_subscription(ph2) is False
-    ret = sub.add_ph_subscriptions(peer1, [ph1], 100)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph1], 100)
     assert ret == {ph1}
-    assert sub.has_ph_subscription(ph1) is True
-    assert sub.has_ph_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph1) is True
+    assert sub.has_puzzle_subscription(ph2) is False
-    ret = sub.add_ph_subscriptions(peer1, [ph1, ph2], 100)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph1, ph2], 100)
     # we have already subscribed to ph1, it's filtered in the returned list
     assert ret == {ph2}
-    assert sub.has_ph_subscription(ph1) is True
-    assert sub.has_ph_subscription(ph2) is True
+    assert sub.has_puzzle_subscription(ph1) is True
+    assert sub.has_puzzle_subscription(ph2) is True
     # note that this is technically a type error as well.
     # we can remove these asserts once we have type checking
         @@@ -43,8 -43,8 +43,8 @@@
     sub.remove_peer(peer1)
-    assert sub.has_ph_subscription(ph1) is False
-    assert sub.has_ph_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph1) is False
+    assert sub.has_puzzle_subscription(ph2) is False
 def test_has_coin_sub() -> None:
         @@@ -65,8 -65,8 +65,8 @@@
     # note that this is technically a type error as well.
     # we can remove these asserts once we have type checking
-    assert sub.has_ph_subscription(coin1) is False
-    assert sub.has_ph_subscription(coin2) is False
+    assert sub.has_puzzle_subscription(coin1) is False
+    assert sub.has_puzzle_subscription(coin2) is False
     sub.remove_peer(peer1)
         @@@ -119,34 -119,34 +119,34 @@@ def test_overlapping_coin_subscriptions
 def test_overlapping_ph_subscriptions() -> None:
     sub = PeerSubscriptions()
-    assert sub.has_ph_subscription(ph1) is False
-    assert sub.has_ph_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph1) is False
+    assert sub.has_puzzle_subscription(ph2) is False
     assert sub.peers_for_puzzle_hash(ph1) == set()
     assert sub.peers_for_puzzle_hash(ph2) == set()
     # subscribed to different phs
-    ret = sub.add_ph_subscriptions(peer1, [ph1], 100)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph1], 100)
     assert ret == {ph1}
     assert sub.peers_for_puzzle_hash(ph1) == {peer1}
     assert sub.peers_for_puzzle_hash(ph2) == set()
-    ret = sub.add_ph_subscriptions(peer2, [ph2], 100)
+    ret = sub.add_puzzle_subscriptions(peer2, [ph2], 100)
     assert ret == {ph2}
-    assert sub.has_ph_subscription(ph1) is True
-    assert sub.has_ph_subscription(ph2) is True
+    assert sub.has_puzzle_subscription(ph1) is True
+    assert sub.has_puzzle_subscription(ph2) is True
     assert sub.peers_for_puzzle_hash(ph1) == {peer1}
     assert sub.peers_for_puzzle_hash(ph2) == {peer2}
     # peer1 is now subscribing to both phs
-    ret = sub.add_ph_subscriptions(peer1, [ph2], 100)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph2], 100)
     assert ret == {ph2}
-    assert sub.has_ph_subscription(ph1) is True
-    assert sub.has_ph_subscription(ph2) is True
+    assert sub.has_puzzle_subscription(ph1) is True
+    assert sub.has_puzzle_subscription(ph2) is True
     assert sub.peers_for_puzzle_hash(ph1) == {peer1}
     assert sub.peers_for_puzzle_hash(ph2) == {peer1, peer2}
         @@@ -154,8 -154,8 +154,8 @@@
     # removing peer1 still leaves the subscription to ph2
     sub.remove_peer(peer1)
-    assert sub.has_ph_subscription(ph1) is False
-    assert sub.has_ph_subscription(ph2) is True
+    assert sub.has_puzzle_subscription(ph1) is False
+    assert sub.has_puzzle_subscription(ph2) is True
     assert sub.peers_for_puzzle_hash(ph1) == set()
     assert sub.peers_for_puzzle_hash(ph2) == {peer2}
         @@@ -164,19 -164,19 +164,19 @@@
 def test_ph_sub_limit() -> None:
     sub = PeerSubscriptions()
-    assert sub.has_ph_subscription(ph1) is False
-    assert sub.has_ph_subscription(ph2) is False
-    assert sub.has_ph_subscription(ph2) is False
-    assert sub.has_ph_subscription(ph3) is False
+    assert sub.has_puzzle_subscription(ph1) is False
+    assert sub.has_puzzle_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph3) is False
-    ret = sub.add_ph_subscriptions(peer1, [ph1, ph2, ph3, ph4], 3)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph1, ph2, ph3, ph4], 3)
     # we only ended up subscribing to 3 puzzle hashes because of the limit
     assert ret == {ph1, ph2, ph3}
-    assert sub.has_ph_subscription(ph1) is True
-    assert sub.has_ph_subscription(ph2) is True
-    assert sub.has_ph_subscription(ph3) is True
-    assert sub.has_ph_subscription(ph4) is False
+    assert sub.has_puzzle_subscription(ph1) is True
+    assert sub.has_puzzle_subscription(ph2) is True
+    assert sub.has_puzzle_subscription(ph3) is True
+    assert sub.has_puzzle_subscription(ph4) is False
     assert sub.peers_for_puzzle_hash(ph1) == {peer1}
     assert sub.peers_for_puzzle_hash(ph2) == {peer1}
         @@@ -184,10 -184,10 +184,10 @@@
     assert sub.peers_for_puzzle_hash(ph4) == set()
     # peer1 should still be limited
-    ret = sub.add_ph_subscriptions(peer1, [ph4], 3)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph4], 3)
     assert ret == set()
-    assert sub.has_ph_subscription(ph4) is False
+    assert sub.has_puzzle_subscription(ph4) is False
     assert sub.peers_for_puzzle_hash(ph4) == set()
     # peer1 is also limied on coin subscriptions
         @@@ -197,10 -197,10 +197,10 @@@
     assert sub.peers_for_coin_id(coin1) == set()
     # peer2 is has its own limit
-    ret = sub.add_ph_subscriptions(peer2, [ph4], 3)
+    ret = sub.add_puzzle_subscriptions(peer2, [ph4], 3)
     assert ret == {ph4}
-    assert sub.has_ph_subscription(ph4) is True
+    assert sub.has_puzzle_subscription(ph4) is True
     assert sub.peers_for_puzzle_hash(ph4) == {peer2}
     sub.remove_peer(peer1)
         @@@ -210,18 -210,18 +210,18 @@@
 def test_ph_sub_limit_incremental() -> None:
     sub = PeerSubscriptions()
-    assert sub.has_ph_subscription(ph1) is False
-    assert sub.has_ph_subscription(ph2) is False
-    assert sub.has_ph_subscription(ph2) is False
-    assert sub.has_ph_subscription(ph3) is False
+    assert sub.has_puzzle_subscription(ph1) is False
+    assert sub.has_puzzle_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph3) is False
-    ret = sub.add_ph_subscriptions(peer1, [ph1], 2)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph1], 2)
     assert ret == {ph1}
-    assert sub.has_ph_subscription(ph1) is True
-    assert sub.has_ph_subscription(ph2) is False
-    assert sub.has_ph_subscription(ph3) is False
-    assert sub.has_ph_subscription(ph4) is False
+    assert sub.has_puzzle_subscription(ph1) is True
+    assert sub.has_puzzle_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph3) is False
+    assert sub.has_puzzle_subscription(ph4) is False
     assert sub.peers_for_puzzle_hash(ph1) == {peer1}
     assert sub.peers_for_puzzle_hash(ph2) == set()
         @@@ -229,13 -229,13 +229,13 @@@
     assert sub.peers_for_puzzle_hash(ph4) == set()
     # this will cross the limit. Only ph2 will be added
-    ret = sub.add_ph_subscriptions(peer1, [ph2, ph3], 2)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph2, ph3], 2)
     assert ret == {ph2}
-    assert sub.has_ph_subscription(ph1) is True
-    assert sub.has_ph_subscription(ph2) is True
-    assert sub.has_ph_subscription(ph3) is False
-    assert sub.has_ph_subscription(ph4) is False
+    assert sub.has_puzzle_subscription(ph1) is True
+    assert sub.has_puzzle_subscription(ph2) is True
+    assert sub.has_puzzle_subscription(ph3) is False
+    assert sub.has_puzzle_subscription(ph4) is False
     assert sub.peers_for_puzzle_hash(ph1) == {peer1}
     assert sub.peers_for_puzzle_hash(ph2) == {peer1}
         @@@ -272,10 -272,10 +272,10 @@@ def test_coin_sub_limit() -> None
     assert sub.peers_for_coin_id(coin4) == set()
     # peer1 is also limied on ph subscriptions
-    ret = sub.add_ph_subscriptions(peer1, [ph1], 3)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph1], 3)
     assert ret == set()
-    assert sub.has_ph_subscription(ph1) is False
+    assert sub.has_puzzle_subscription(ph1) is False
     assert sub.peers_for_puzzle_hash(ph1) == set()
     # peer2 is has its own limit
         @@@ -327,31 -327,31 +327,77 @@@ def test_coin_sub_limit_incremental() -
 def test_ph_subscription_duplicates() -> None:
     sub = PeerSubscriptions()
-    assert sub.has_ph_subscription(ph1) is False
-    assert sub.has_ph_subscription(ph2) is False
-    assert sub.has_ph_subscription(ph3) is False
-    assert sub.has_ph_subscription(ph4) is False
+    assert sub.has_puzzle_subscription(ph1) is False
+    assert sub.has_puzzle_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph3) is False
+    assert sub.has_puzzle_subscription(ph4) is False
-    ret = sub.add_ph_subscriptions(peer1, [ph1, ph2, ph3], 100)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph1, ph2, ph3], 100)
     assert ret == {ph1, ph2, ph3}
-    assert sub.has_ph_subscription(ph1) is True
-    assert sub.has_ph_subscription(ph2) is True
-    assert sub.has_ph_subscription(ph3) is True
-    assert sub.has_ph_subscription(ph4) is False
+    assert sub.has_puzzle_subscription(ph1) is True
+    assert sub.has_puzzle_subscription(ph2) is True
+    assert sub.has_puzzle_subscription(ph3) is True
+    assert sub.has_puzzle_subscription(ph4) is False
     # only ph4 is new, the others are duplicates and ignored
-    ret = sub.add_ph_subscriptions(peer1, [ph1, ph2, ph3, ph4], 100)
+    ret = sub.add_puzzle_subscriptions(peer1, [ph1, ph2, ph3, ph4], 100)
     assert ret == {ph4}
-    assert sub.has_ph_subscription(ph1) is True
-    assert sub.has_ph_subscription(ph2) is True
-    assert sub.has_ph_subscription(ph3) is True
-    assert sub.has_ph_subscription(ph4) is True
+    assert sub.has_puzzle_subscription(ph1) is True
+    assert sub.has_puzzle_subscription(ph2) is True
+    assert sub.has_puzzle_subscription(ph3) is True
+    assert sub.has_puzzle_subscription(ph4) is True
     sub.remove_peer(peer1)
-    assert sub.has_ph_subscription(ph1) is False
-    assert sub.has_ph_subscription(ph2) is False
-    assert sub.has_ph_subscription(ph3) is False
-    assert sub.has_ph_subscription(ph4) is False
+    assert sub.has_puzzle_subscription(ph1) is False
+    assert sub.has_puzzle_subscription(ph2) is False
+    assert sub.has_puzzle_subscription(ph3) is False
+    assert sub.has_puzzle_subscription(ph4) is False
+def test_remove_ph_subscriptions() -> None:
+    sub = PeerSubscriptions()
+    added = sub.add_puzzle_subscriptions(peer1, [ph1, ph2, ph3, ph4, ph4], 100)
+    assert added == {ph1, ph2, ph3, ph4}
+    removed = sub.remove_puzzle_subscriptions(peer1, list(added))
+    assert removed == added
+    # These have already been removed.
+    assert len(sub.remove_puzzle_subscriptions(peer1, [ph1, ph2])) == 0
+    assert sub.peer_subscription_count(peer1) == 0
+    for ph in removed:
+        assert not sub.has_puzzle_subscription(ph)
+def test_remove_coin_subscriptions() -> None:
+    sub = PeerSubscriptions()
+    added = sub.add_coin_subscriptions(peer1, [coin1, coin2, coin3, coin4, coin4], 100)
+    assert added == {coin1, coin2, coin3, coin4}
+    removed = sub.remove_coin_subscriptions(peer1, list(added))
+    assert removed == added
+    # These have already been removed.
+    assert len(sub.remove_coin_subscriptions(peer1, [coin1, coin2])) == 0
+    assert sub.peer_subscription_count(peer1) == 0
+    for coin_id in removed:
+        assert not sub.has_coin_subscription(coin_id)
+def test_subscription_list() -> None:
+    sub = PeerSubscriptions()
+    sub.add_coin_subscriptions(peer1, [coin1, coin2], 4)
+    sub.add_puzzle_subscriptions(peer1, [ph1, ph2], 4)
+    assert sub.coin_subscriptions(peer1) == {coin1, coin2}
+    assert sub.puzzle_subscriptions(peer1) == {ph1, ph2}

tests/core/mempool/test_mempool_performance.py CHANGED Viewed

         @@@ -7,19 -7,19 +7,14 @@@ import pytes
 from chia.types.full_block import FullBlock
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.peer_info import PeerInfo
-from chia.util.ints import uint32, uint64, uint128
+from chia.util.ints import uint64, uint128
 from chia.wallet.util.tx_config import DEFAULT_TX_CONFIG
 from chia.wallet.wallet_node import WalletNode
-from tests.util.misc import BenchmarkRunner
+from tests.util.misc import BenchmarkRunner, wallet_height_at_least
 from tests.util.setup_nodes import OldSimulatorsAndWallets
 from tests.util.time_out_assert import time_out_assert
-async def wallet_height_at_least(wallet_node: WalletNode, h: uint32) -> bool:
-    height = await wallet_node.wallet_state_manager.blockchain.get_finished_sync_up_to()
-    return height == h
 async def wallet_balance_at_least(wallet_node: WalletNode, balance: uint128) -> bool:
     b = await wallet_node.wallet_state_manager.get_confirmed_balance_for_wallet(1)
     return b >= balance

tests/core/server/test_loop.py CHANGED Viewed

         @@@ -14,6 -14,6 +14,7 @@@ from typing import AsyncIterator, List
 import anyio
 import pytest
+import tests
 from chia.server import chia_policy
 from chia.util.timing import adjusted_timeout
 from tests.core.server import serve
         @@@ -160,9 -160,9 +161,12 @@@ async def test_loop(tmp_path: pathlib.P
     flood_file = tmp_path.joinpath("flood")
     flood_file.touch()
+    env = {**os.environ, "PYTHONPATH": pathlib.Path(tests.__file__).parent.parent.as_posix()}
     logger.info(" ==== launching serve.py")
     with subprocess.Popen(
         [sys.executable, "-m", "tests.core.server.serve", os.fspath(serve_file)],
+        env=env,
     ):
         logger.info(" ====           serve.py running")
         @@@ -171,6 -171,6 +175,7 @@@
         logger.info(" ==== launching flood.py")
         with subprocess.Popen(
             [sys.executable, "-m", "tests.core.server.flood", os.fspath(flood_file)],
+            env=env,
         ):
             logger.info(" ====           flood.py running")

tests/core/test_coins.py CHANGED Viewed

         @@@ -2,10 -2,10 +2,10 @@@ from __future__ import annotation
 from itertools import permutations
-from benchmarks.utils import rand_hash
 from chia.types.blockchain_format.coin import hash_coin_ids
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.hash import std_hash
+from tests.util.benchmarks import rand_hash
 def test_hash_coin_ids_empty() -> None:

tests/core/test_full_node_rpc.py CHANGED Viewed

         @@@ -631,6 -631,6 +631,10 @@@ async def test_get_blockchain_state(one
         # When supplying genesis block, there are no older blocks so `None` should be returned
         assert await get_average_block_time(full_node_api_1.full_node.blockchain, block_records[0], 4608) is None
         assert await get_average_block_time(full_node_api_1.full_node.blockchain, block_records[-1], 4608) is not None
+        # Test that get_aggsig_additional_data() returns correctly
+        assert (
+            full_node_api_1.full_node.constants.AGG_SIG_ME_ADDITIONAL_DATA == await client.get_aggsig_additional_data()
+        )
     finally:
         # Checks that the RPC manages to stop the node

tests/core/util/test_keychain.py CHANGED Viewed

         @@@ -1,15 -1,15 +1,16 @@@
 from __future__ import annotations
 import json
-import pathlib
 import random
 from dataclasses import replace
 from typing import Callable, List, Optional, Tuple
+import pkg_resources
 import pytest
 from chia_rs import AugSchemeMPL, G1Element, PrivateKey
 import tests
+import tests.util
 from chia.simulator.keyring import TempKeyring
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.util.errors import (
         @@@ -156,7 -156,7 +157,8 @@@ class TestKeychain
         assert child_sk == PrivateKey.from_bytes(tv_child_int.to_bytes(32, "big"))
     def test_bip39_test_vectors(self):
-        with open("tests/util/bip39_test_vectors.json") as f:
+        test_vectors_path = pkg_resources.resource_filename(tests.util.__name__, "bip39_test_vectors.json")
+        with open(test_vectors_path) as f:
             all_vectors = json.loads(f.read())
         for vector_list in all_vectors["english"]:
         @@@ -172,7 -172,7 +174,7 @@@
         """
         Tests that the first 4 letters of each mnemonic phrase matches as if it were the full phrase
         """
-        test_vectors_path = pathlib.Path(tests.__file__).parent.joinpath("util", "bip39_test_vectors.json")
+        test_vectors_path = pkg_resources.resource_filename(tests.util.__name__, "bip39_test_vectors.json")
         with open(test_vectors_path) as f:
             all_vectors = json.load(f)

tests/core/util/test_streamable.py CHANGED Viewed

         @@@ -555,7 -555,7 +555,7 @@@ def test_recursive_types() -> None
 def test_ambiguous_deserialization_optionals() -> None:
-    with pytest.raises(AssertionError):
+    with pytest.raises(ValueError, match="unexpected end of buffer"):
         SubEpochChallengeSegment.from_bytes(b"\x00\x00\x00\x03\xff\xff\xff\xff")
     @streamable

tests/pools/test_pool_wallet.py CHANGED Viewed

         @@@ -8,9 -8,9 +8,9 @@@ from unittest.mock import MagicMoc
 import pytest
 from chia_rs import G1Element
-from benchmarks.utils import rand_g1, rand_hash
 from chia.pools.pool_wallet import PoolWallet
 from chia.types.blockchain_format.sized_bytes import bytes32
+from tests.util.benchmarks import rand_g1, rand_hash
 @dataclass

tests/tools/test_full_sync.py CHANGED Viewed

         @@@ -8,7 -8,7 +8,7 @@@ from pathlib import Pat
 import pytest
-from tools.test_full_sync import run_sync_test
+from tests.util.full_sync import run_sync_test
 @pytest.mark.parametrize("keep_up", [True, False])

tests/tools/test_legacy_keyring.py CHANGED Viewed

         @@@ -12,7 -12,7 +12,7 @@@ except ImportError
     if sys.platform == "linux":
         raise
-from tools.legacy_keyring import create_legacy_keyring, generate_and_add, get_keys, legacy_keyring
+from chia.legacy.keyring import create_legacy_keyring, generate_and_add, get_keys, legacy_keyring
 def show() -> Result:

tests/tools/test_run_block.py CHANGED Viewed

         @@@ -10,7 -10,7 +10,7 @@@ from chia.types.blockchain_format.sized
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
 from chia.util.ints import uint32, uint64, uint128
-from tools.run_block import run_json_block
+from tests.util.run_block import run_json_block
 constants = dataclasses.replace(
     DEFAULT_CONSTANTS,

tests/util/benchmark_cost.py ADDED Viewed

         @@@ -42,7 -42,7 +42,7 @@@ def run_and_return_cost_time(chialisp)
     clvm_loop_solution = f"(1000 {chialisp})"
     solution_program = Program.to(binutils.assemble(clvm_loop_solution))
-    cost, sexp = loop_program.run_with_cost(solution_program, INFINITE_COST)
+    cost, _ = loop_program.run_with_cost(INFINITE_COST, solution_program)
     end = time.time()
     total_time = end - start
         @@@ -135,7 -135,7 +135,7 @@@ if __name__ == "__main__"
     puzzle_start = time.time()
     clvm_cost = 0
     for i in range(0, 1000):
-        cost_run, sexp = puzzles[i].run_with_cost(solutions[i], INFINITE_COST)
+        cost_run, _ = puzzles[i].run_with_cost(INFINITE_COST, solutions[i])
         clvm_cost += cost_run
     puzzle_end = time.time()

tests/util/benchmarks.py RENAMED Viewed

         @@@ -1,0 -1,0 +1,155 @@@
+from __future__ import annotations
+import random
+from typing import Tuple
+import pkg_resources
+from chia_rs import AugSchemeMPL, ClassgroupElement, Coin, G1Element, G2Element, VDFInfo, VDFProof
+from chia.consensus.coinbase import create_farmer_coin, create_pool_coin
+from chia.consensus.default_constants import DEFAULT_CONSTANTS
+from chia.types.blockchain_format.foliage import Foliage, FoliageBlockData, FoliageTransactionBlock, TransactionsInfo
+from chia.types.blockchain_format.pool_target import PoolTarget
+from chia.types.blockchain_format.proof_of_space import ProofOfSpace
+from chia.types.blockchain_format.reward_chain_block import RewardChainBlock
+from chia.types.blockchain_format.serialized_program import SerializedProgram
+from chia.types.blockchain_format.sized_bytes import bytes32, bytes100
+from chia.types.full_block import FullBlock
+from chia.util.ints import uint8, uint32, uint64, uint128
+# farmer puzzle hash
+ph = bytes32(b"a" * 32)
+clvm_generator_bin_path = pkg_resources.resource_filename(__name__, "clvm_generator.bin")
+with open(clvm_generator_bin_path, "rb") as f:
+    clvm_generator = f.read()
+def rewards(height: uint32) -> Tuple[Coin, Coin]:
+    farmer_coin = create_farmer_coin(height, ph, uint64(250000000), DEFAULT_CONSTANTS.GENESIS_CHALLENGE)
+    pool_coin = create_pool_coin(height, ph, uint64(1750000000), DEFAULT_CONSTANTS.GENESIS_CHALLENGE)
+    return farmer_coin, pool_coin
+def rand_bytes(num: int) -> bytes:
+    ret = bytearray(num)
+    for i in range(num):
+        ret[i] = random.getrandbits(8)
+    return bytes(ret)
+def rand_hash() -> bytes32:
+    return bytes32(rand_bytes(32))
+def rand_g1() -> G1Element:
+    sk = AugSchemeMPL.key_gen(rand_bytes(96))
+    return sk.get_g1()
+def rand_g2() -> G2Element:
+    sk = AugSchemeMPL.key_gen(rand_bytes(96))
+    return AugSchemeMPL.sign(sk, b"foobar")
+def rand_class_group_element() -> ClassgroupElement:
+    return ClassgroupElement(bytes100(rand_bytes(100)))
+def rand_vdf() -> VDFInfo:
+    return VDFInfo(rand_hash(), uint64(random.randint(100000, 1000000000)), rand_class_group_element())
+def rand_vdf_proof() -> VDFProof:
+    return VDFProof(
+        uint8(1),  # witness_type
+        rand_hash(),  # witness
+        bool(random.randint(0, 1)),  # normalized_to_identity
+    )
+def rand_full_block() -> FullBlock:
+    proof_of_space = ProofOfSpace(
+        rand_hash(),
+        rand_g1(),
+        None,
+        rand_g1(),
+        uint8(0),
+        rand_bytes(8 * 32),
+    )
+    reward_chain_block = RewardChainBlock(
+        uint128(1),
+        uint32(2),
+        uint128(3),
+        uint8(4),
+        rand_hash(),
+        proof_of_space,
+        None,
+        rand_g2(),
+        rand_vdf(),
+        None,
+        rand_g2(),
+        rand_vdf(),
+        rand_vdf(),
+        True,
+    )
+    pool_target = PoolTarget(
+        rand_hash(),
+        uint32(0),
+    )
+    foliage_block_data = FoliageBlockData(
+        rand_hash(),
+        pool_target,
+        rand_g2(),
+        rand_hash(),
+        rand_hash(),
+    )
+    foliage = Foliage(
+        rand_hash(),
+        rand_hash(),
+        foliage_block_data,
+        rand_g2(),
+        rand_hash(),
+        rand_g2(),
+    )
+    foliage_transaction_block = FoliageTransactionBlock(
+        rand_hash(),
+        uint64(0),
+        rand_hash(),
+        rand_hash(),
+        rand_hash(),
+        rand_hash(),
+    )
+    farmer_coin, pool_coin = rewards(uint32(0))
+    transactions_info = TransactionsInfo(
+        rand_hash(),
+        rand_hash(),
+        rand_g2(),
+        uint64(0),
+        uint64(1),
+        [farmer_coin, pool_coin],
+    )
+    full_block = FullBlock(
+        [],
+        reward_chain_block,
+        rand_vdf_proof(),
+        rand_vdf_proof(),
+        rand_vdf_proof(),
+        rand_vdf_proof(),
+        rand_vdf_proof(),
+        foliage,
+        foliage_transaction_block,
+        transactions_info,
+        SerializedProgram.from_bytes(clvm_generator),
+        [],
+    )
+    return full_block

tests/util/full_sync.py RENAMED Viewed

         @@@ -1,0 -1,0 +1,226 @@@
+from __future__ import annotations
+import cProfile
+import logging
+import shutil
+import tempfile
+import time
+from contextlib import contextmanager
+from pathlib import Path
+from typing import Iterator, List, Optional, cast
+import aiosqlite
+import zstd
+from chia.cmds.init_funcs import chia_init
+from chia.consensus.default_constants import DEFAULT_CONSTANTS
+from chia.full_node.full_node import FullNode
+from chia.server.outbound_message import Message, NodeType
+from chia.server.server import ChiaServer
+from chia.server.ws_connection import ConnectionCallback, WSChiaConnection
+from chia.simulator.block_tools import make_unfinished_block
+from chia.types.blockchain_format.sized_bytes import bytes32
+from chia.types.full_block import FullBlock
+from chia.types.peer_info import PeerInfo
+from chia.util.config import load_config
+from chia.util.ints import uint16
+from tests.util.constants import test_constants as TEST_CONSTANTS
+class ExitOnError(logging.Handler):
+    def __init__(self) -> None:
+        super().__init__()
+        self.exit_with_failure = False
+    def emit(self, record: logging.LogRecord) -> None:
+        if record.levelno != logging.ERROR:
+            return
+        self.exit_with_failure = True
+@contextmanager
+def enable_profiler(profile: bool, counter: int) -> Iterator[None]:
+    if not profile:
+        yield
+        return
+    with cProfile.Profile() as pr:
+        receive_start_time = time.monotonic()
+        yield
+    if time.monotonic() - receive_start_time > 5:
+        pr.create_stats()
+        pr.dump_stats(f"slow-batch-{counter:05d}.profile")
+class FakeServer:
+    async def send_to_all(
+        self, messages: List[Message], node_type: NodeType, exclude: Optional[bytes32] = None
+    ) -> None:
+        pass
+    def set_received_message_callback(self, callback: ConnectionCallback) -> None:
+        pass
+    async def get_peer_info(self) -> Optional[PeerInfo]:
+        return None
+    def get_connections(
+        self, node_type: Optional[NodeType] = None, *, outbound: Optional[bool] = False
+    ) -> List[WSChiaConnection]:
+        return []
+    def is_duplicate_or_self_connection(self, target_node: PeerInfo) -> bool:
+        return False
+    async def start_client(
+        self,
+        target_node: PeerInfo,
+        on_connect: Optional[ConnectionCallback] = None,
+        auth: bool = False,
+        is_feeler: bool = False,
+    ) -> bool:
+        return False
+class FakePeer:
+    def get_peer_logging(self) -> PeerInfo:
+        return PeerInfo("0.0.0.0", uint16(0))
+    def __init__(self) -> None:
+        self.peer_node_id = bytes([0] * 32)
+    async def get_peer_info(self) -> Optional[PeerInfo]:
+        return None
+async def run_sync_test(
+    file: Path,
+    db_version: int,
+    profile: bool,
+    single_thread: bool,
+    test_constants: bool,
+    keep_up: bool,
+    db_sync: str,
+    node_profiler: bool,
+    start_at_checkpoint: Optional[str],
+) -> None:
+    logger = logging.getLogger()
+    logger.setLevel(logging.WARNING)
+    handler = logging.FileHandler("test-full-sync.log")
+    handler.setFormatter(
+        logging.Formatter(
+            "%(levelname)-8s %(message)s",
+            datefmt="%Y-%m-%dT%H:%M:%S",
+        )
+    )
+    logger.addHandler(handler)
+    check_log = ExitOnError()
+    logger.addHandler(check_log)
+    with tempfile.TemporaryDirectory() as root_dir:
+        root_path = Path(root_dir, "root")
+        if start_at_checkpoint is not None:
+            shutil.copytree(start_at_checkpoint, root_path)
+        chia_init(root_path, should_check_keys=False, v1_db=(db_version == 1))
+        config = load_config(root_path, "config.yaml")
+        if test_constants:
+            constants = TEST_CONSTANTS
+        else:
+            overrides = config["network_overrides"]["constants"][config["selected_network"]]
+            constants = DEFAULT_CONSTANTS.replace_str_to_bytes(**overrides)
+        if single_thread:
+            config["full_node"]["single_threaded"] = True
+        config["full_node"]["db_sync"] = db_sync
+        config["full_node"]["enable_profiler"] = node_profiler
+        full_node = await FullNode.create(
+            config["full_node"],
+            root_path=root_path,
+            consensus_constants=constants,
+        )
+        full_node.set_server(cast(ChiaServer, FakeServer()))
+        async with full_node.manage():
+            peak = full_node.blockchain.get_peak()
+            if peak is not None:
+                height = int(peak.height)
+            else:
+                height = 0
+            peer: WSChiaConnection = cast(WSChiaConnection, FakePeer())
+            print()
+            counter = 0
+            monotonic = height
+            prev_hash = None
+            async with aiosqlite.connect(file) as in_db:
+                await in_db.execute("pragma query_only")
+                rows = await in_db.execute(
+                    "SELECT header_hash, height, block FROM full_blocks "
+                    "WHERE height >= ? AND in_main_chain=1 ORDER BY height",
+                    (height,),
+                )
+                block_batch = []
+                start_time = time.monotonic()
+                logger.warning(f"starting test {start_time}")
+                worst_batch_height = None
+                worst_batch_time_per_block = None
+                peer_info = peer.get_peer_logging()
+                async for r in rows:
+                    batch_start_time = time.monotonic()
+                    with enable_profiler(profile, height):
+                        block = FullBlock.from_bytes(zstd.decompress(r[2]))
+                        block_batch.append(block)
+                        assert block.height == monotonic
+                        monotonic += 1
+                        assert prev_hash is None or block.prev_header_hash == prev_hash
+                        prev_hash = block.header_hash
+                        if len(block_batch) < 32:
+                            continue
+                        if keep_up:
+                            for b in block_batch:
+                                await full_node.add_unfinished_block(make_unfinished_block(b, constants), peer)
+                                await full_node.add_block(b)
+                        else:
+                            success, summary, _ = await full_node.add_block_batch(block_batch, peer_info, None)
+                            end_height = block_batch[-1].height
+                            full_node.blockchain.clean_block_record(end_height - full_node.constants.BLOCKS_CACHE_SIZE)
+                            if not success:
+                                raise RuntimeError("failed to ingest block batch")
+                            assert summary is not None
+                        time_per_block = (time.monotonic() - batch_start_time) / len(block_batch)
+                        if not worst_batch_height or worst_batch_time_per_block > time_per_block:
+                            worst_batch_height = height
+                            worst_batch_time_per_block = time_per_block
+                    counter += len(block_batch)
+                    height += len(block_batch)
+                    print(
+                        f"\rheight {height} {time_per_block:0.2f} s/block   ",
+                        end="",
+                    )
+                    block_batch = []
+                    if check_log.exit_with_failure:
+                        raise RuntimeError("error printed to log. exiting")
+                    if counter >= 100000:
+                        counter = 0
+                        print()
+                end_time = time.monotonic()
+                logger.warning(f"test completed at {end_time}")
+                logger.warning(f"duration: {end_time - start_time:0.2f} s")
+                logger.warning(f"worst time-per-block: {worst_batch_time_per_block:0.2f} s")
+                logger.warning(f"worst height: {worst_batch_height}")
+                logger.warning(f"end-height: {height}")
+            if node_profiler:
+                (root_path / "profile-node").rename("./profile-node")

tests/util/misc.py ADDED Viewed

         @@@ -27,8 -27,8 +27,9 @@@ from chia.full_node.mempool import Memp
 from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.util.hash import std_hash
-from chia.util.ints import uint64
+from chia.util.ints import uint32, uint64
 from chia.wallet.util.compute_hints import HintedCoin
+from chia.wallet.wallet_node import WalletNode
 from tests.core.data_layer.util import ChiaRoot
         @@@ -424,3 -424,3 +425,8 @@@ def invariant_check_mempool(mempool: Me
         if val is None:
             val = 0
     assert mempool._total_fee == val
+async def wallet_height_at_least(wallet_node: WalletNode, h: uint32) -> bool:
+    height = await wallet_node.wallet_state_manager.blockchain.get_finished_sync_up_to()
+    return height == h

tests/util/run_block.py RENAMED Viewed

         @@@ -1,0 -1,0 +1,161 @@@
+from __future__ import annotations
+import json
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any, Dict, List, Tuple
+from chia_rs import Coin
+from chia.consensus.constants import ConsensusConstants
+from chia.types.blockchain_format.serialized_program import SerializedProgram
+from chia.types.blockchain_format.sized_bytes import bytes32
+from chia.types.condition_opcodes import ConditionOpcode
+from chia.types.condition_with_args import ConditionWithArgs
+from chia.types.generator_types import BlockGenerator
+from chia.util.ints import uint32, uint64
+from chia.wallet.cat_wallet.cat_utils import match_cat_puzzle
+from chia.wallet.puzzles.load_clvm import load_serialized_clvm_maybe_recompile
+from chia.wallet.uncurried_puzzle import uncurry_puzzle
+DESERIALIZE_MOD = load_serialized_clvm_maybe_recompile(
+    "chialisp_deserialisation.clsp", package_or_requirement="chia.consensus.puzzles"
+)
+@dataclass
+class NPC:
+    coin_name: bytes32
+    puzzle_hash: bytes32
+    conditions: List[Tuple[ConditionOpcode, List[ConditionWithArgs]]]
+@dataclass
+class CAT:
+    asset_id: str
+    memo: str
+    npc: NPC
+    def cat_to_dict(self) -> Dict[str, Any]:
+        return {"asset_id": self.asset_id, "memo": self.memo, "npc": npc_to_dict(self.npc)}
+def condition_with_args_to_dict(condition_with_args: ConditionWithArgs) -> Dict[str, Any]:
+    return {
+        "condition_opcode": condition_with_args.opcode.name,
+        "arguments": [arg.hex() for arg in condition_with_args.vars],
+    }
+def condition_list_to_dict(condition_list: Tuple[ConditionOpcode, List[ConditionWithArgs]]) -> List[Dict[str, Any]]:
+    assert all([condition_list[0] == cwa.opcode for cwa in condition_list[1]])
+    return [condition_with_args_to_dict(cwa) for cwa in condition_list[1]]
+def npc_to_dict(npc: NPC) -> Dict[str, Any]:
+    return {
+        "coin_name": npc.coin_name.hex(),
+        "conditions": [{"condition_type": c[0].name, "conditions": condition_list_to_dict(c)} for c in npc.conditions],
+        "puzzle_hash": npc.puzzle_hash.hex(),
+    }
+def run_generator(block_generator: BlockGenerator, constants: ConsensusConstants, max_cost: int) -> List[CAT]:
+    block_args = [bytes(a) for a in block_generator.generator_refs]
+    cost, block_result = block_generator.program.run_with_cost(max_cost, [DESERIALIZE_MOD, block_args])
+    coin_spends = block_result.first()
+    cat_list: List[CAT] = []
+    for spend in coin_spends.as_iter():
+        parent, puzzle, amount, solution = spend.as_iter()
+        args = match_cat_puzzle(uncurry_puzzle(puzzle))
+        if args is None:
+            continue
+        _, asset_id, _ = args
+        memo = ""
+        puzzle_result = puzzle.run(solution)
+        conds: Dict[ConditionOpcode, List[ConditionWithArgs]] = {}
+        for condition in puzzle_result.as_python():
+            op = ConditionOpcode(condition[0])
+            if op not in conds:
+                conds[op] = []
+            if condition[0] != ConditionOpcode.CREATE_COIN or len(condition) < 4:
+                conds[op].append(ConditionWithArgs(op, [i for i in condition[1:3]]))
+                continue
+            # If only 3 elements (opcode + 2 args), there is no memo, this is ph, amount
+            if type(condition[3]) is not list:
+                # If it's not a list, it's not the correct format
+                conds[op].append(ConditionWithArgs(op, [i for i in condition[1:3]]))
+                continue
+            conds[op].append(ConditionWithArgs(op, [i for i in condition[1:3]] + [condition[3][0]]))
+            # special retirement address
+            if condition[3][0].hex() != "0000000000000000000000000000000000000000000000000000000000000000":
+                continue
+            if len(condition[3]) >= 2:
+                try:
+                    memo = condition[3][1].decode("utf-8", errors="strict")
+                except UnicodeError:
+                    pass  # ignore this error which should leave memo as empty string
+            # technically there could be more such create_coin ops in the list but our wallet does not
+            # so leaving it for the future
+            break
+        puzzle_hash = puzzle.get_tree_hash()
+        coin = Coin(bytes32(parent.as_atom()), puzzle_hash, amount.as_int())
+        cat_list.append(
+            CAT(
+                asset_id=bytes(asset_id).hex()[2:],
+                memo=memo,
+                npc=NPC(coin.name(), puzzle_hash, [(op, cond) for op, cond in conds.items()]),
+            )
+        )
+    return cat_list
+def ref_list_to_args(ref_list: List[uint32], root_path: Path) -> List[SerializedProgram]:
+    args = []
+    for height in ref_list:
+        with open(root_path / f"{height}.json", "rb") as f:
+            program_str = json.load(f)["block"]["transactions_generator"]
+            args.append(SerializedProgram.fromhex(program_str))
+    return args
+def run_generator_with_args(
+    generator_program_hex: str,
+    generator_args: List[SerializedProgram],
+    constants: ConsensusConstants,
+    cost: uint64,
+) -> List[CAT]:
+    if not generator_program_hex:
+        return []
+    generator_program = SerializedProgram.fromhex(generator_program_hex)
+    block_generator = BlockGenerator(generator_program, generator_args, [])
+    return run_generator(block_generator, constants, min(constants.MAX_BLOCK_COST_CLVM, cost))
+def run_json_block(full_block: Dict[str, Any], parent: Path, constants: ConsensusConstants) -> List[CAT]:
+    ref_list = full_block["block"]["transactions_generator_ref_list"]
+    tx_info: Dict[str, Any] = full_block["block"]["transactions_info"]
+    generator_program_hex: str = full_block["block"]["transactions_generator"]
+    cat_list: List[CAT] = []
+    if tx_info and generator_program_hex:
+        cost = tx_info["cost"]
+        args = ref_list_to_args(ref_list, parent)
+        cat_list = run_generator_with_args(generator_program_hex, args, constants, cost)
+    return cat_list

tests/util/test_full_block_utils.py CHANGED Viewed

         @@@ -6,7 -6,7 +6,6 @@@ from typing import Generator, Iterator
 import pytest
 from chia_rs import G1Element, G2Element
-from benchmarks.utils import rand_bytes, rand_g1, rand_g2, rand_hash, rand_vdf, rand_vdf_proof, rewards
 from chia.types.blockchain_format.foliage import Foliage, FoliageBlockData, FoliageTransactionBlock, TransactionsInfo
 from chia.types.blockchain_format.pool_target import PoolTarget
 from chia.types.blockchain_format.proof_of_space import ProofOfSpace
         @@@ -26,6 -26,6 +25,7 @@@ from chia.types.header_block import Hea
 from chia.util.full_block_utils import block_info_from_block, generator_from_block, header_block_from_block
 from chia.util.generator_tools import get_block_header
 from chia.util.ints import uint8, uint32, uint64, uint128
+from tests.util.benchmarks import rand_bytes, rand_g1, rand_g2, rand_hash, rand_vdf, rand_vdf_proof, rewards
 test_g2s: List[G2Element] = [rand_g2() for _ in range(10)]
 test_g1s: List[G1Element] = [rand_g1() for _ in range(10)]

tests/util/test_misc.py CHANGED Viewed

         @@@ -1,14 -1,14 +1,16 @@@
 from __future__ import annotations
 import contextlib
-from typing import AsyncIterator, Iterator, List
+from typing import AsyncIterator, Iterator, List, Optional, TypeVar
+import anyio
 import pytest
 from chia.util.errors import InvalidPathError
 from chia.util.misc import (
     SplitAsyncManager,
     SplitManager,
+    ValuedEvent,
     format_bytes,
     format_minutes,
     split_async_manager,
         @@@ -16,6 -16,6 +18,9 @@@
     to_batches,
     validate_directory_writable,
 )
+from chia.util.timing import adjusted_timeout, backoff_times
+T = TypeVar("T")
 class TestMisc:
         @@@ -306,3 -306,3 +311,103 @@@ async def test_split_async_manager_rais
     with pytest.raises(Exception, match="^not yet entered$"):
         await split.exit()
+async def wait_for_valued_event_waiters(
+    event: ValuedEvent[T],
+    count: int,
+    timeout: float = 10,
+) -> None:
+    with anyio.fail_after(delay=adjusted_timeout(timeout)):
+        for delay in backoff_times():
+            # ignoring the type since i'm hacking into the private attribute
+            # hopefully this is ok for testing and if it becomes invalid we
+            # will end up with an exception and can adjust then
+            if len(event._event._waiters) >= count:  # type: ignore[attr-defined]
+                return
+            await anyio.sleep(delay)
+@pytest.mark.anyio
+async def test_valued_event_wait_already_set() -> None:
+    valued_event = ValuedEvent[int]()
+    value = 37
+    valued_event.set(value)
+    with anyio.fail_after(adjusted_timeout(10)):
+        result = await valued_event.wait()
+    assert result == value
+@pytest.mark.anyio
+async def test_valued_event_wait_not_yet_set() -> None:
+    valued_event = ValuedEvent[int]()
+    value = 37
+    result: Optional[int] = None
+    async def wait(valued_event: ValuedEvent[int]) -> None:
+        nonlocal result
+        result = await valued_event.wait()
+    with anyio.fail_after(adjusted_timeout(10)):
+        async with anyio.create_task_group() as task_group:
+            task_group.start_soon(wait, valued_event)
+            await wait_for_valued_event_waiters(event=valued_event, count=1)
+            valued_event.set(value)
+    assert result == value
+@pytest.mark.anyio
+async def test_valued_event_wait_blocks_when_not_set() -> None:
+    valued_event = ValuedEvent[int]()
+    with pytest.raises(TimeoutError):
+        # if we could just process until there are no pending events, that would be great
+        with anyio.fail_after(adjusted_timeout(1)):
+            await valued_event.wait()
+@pytest.mark.anyio
+async def test_valued_event_multiple_waits_all_get_values() -> None:
+    results: List[int] = []
+    valued_event = ValuedEvent[int]()
+    value = 37
+    task_count = 10
+    async def wait_and_append() -> None:
+        results.append(await valued_event.wait())
+    async with anyio.create_task_group() as task_group:
+        for i in range(task_count):
+            task_group.start_soon(wait_and_append, name=f"wait_and_append_{i}")
+        await wait_for_valued_event_waiters(event=valued_event, count=task_count)
+        valued_event.set(value)
+    assert results == [value] * task_count
+@pytest.mark.anyio
+async def test_valued_event_set_again_raises_and_does_not_change_value() -> None:
+    valued_event = ValuedEvent[int]()
+    value = 37
+    valued_event.set(value)
+    with pytest.raises(Exception, match="^Value already set$"):
+        valued_event.set(value + 1)
+    with anyio.fail_after(adjusted_timeout(10)):
+        result = await valued_event.wait()
+    assert result == value
+@pytest.mark.anyio
+async def test_valued_event_wait_raises_if_not_set() -> None:
+    valued_event = ValuedEvent[int]()
+    valued_event._event.set()
+    with pytest.raises(Exception, match="^Value not set despite event being set$"):
+        with anyio.fail_after(adjusted_timeout(10)):
+            await valued_event.wait()

tests/util/test_network_protocol_test.py ADDED Viewed

         @@@ -3,7 -3,7 +3,7 @@@ from __future__ import annotation
 import ast
 import inspect
-from typing import Any, Set, cast
+from typing import Any, Dict, Set, cast
 from chia.protocols import (
     farmer_protocol,
         @@@ -11,6 -11,6 +11,7 @@@
     harvester_protocol,
     introducer_protocol,
     pool_protocol,
+    protocol_message_types,
     shared_protocol,
     timelord_protocol,
     wallet_protocol,
         @@@ -47,6 -47,6 +48,30 @@@ def test_missing_messages_state_machine
     ), "A message was added to the protocol state machine. Make sure to update the protocol message regression test to include the new message"
+def test_message_ids() -> None:
+    parsed = ast.parse(inspect.getsource(protocol_message_types))
+    message_ids: Dict[int, str] = {}
+    for line in parsed.body:
+        if not isinstance(line, ast.ClassDef) or line.name != "ProtocolMessageTypes":
+            continue
+        for entry in line.body:
+            if not isinstance(entry, ast.Assign):  # pragma: no cover
+                continue
+            assert isinstance(entry.value, ast.Constant)
+            assert isinstance(entry.targets[0], ast.Name)
+            message_id = entry.value.value
+            message_name = entry.targets[0].id
+            if message_id in message_ids:  # pragma: no cover
+                raise AssertionError(
+                    f'protocol message ID clash between "{message_name}" and "{message_ids[message_id]}". Value {message_id}'
+                )
+            message_ids[message_id] = message_name
+            if message_id < 0 or message_id > 255:  # pragma: no cover
+                raise AssertionError(f'message ID must fit in a uint8. "{message_name}" has value {message_id}')
+        break
+    assert len(message_ids) > 0
 def test_missing_messages() -> None:
     wallet_msgs = {
         "CoinState",

tests/util/test_recursive_replace.py RENAMED Viewed

         @@@ -1,0 -1,0 +1,116 @@@
+from __future__ import annotations
+import copy
+from dataclasses import dataclass
+from typing import List, Optional, Union
+import pytest
+from chia.util.recursive_replace import recursive_replace
+class TestC:
+    a: int
+    b: str
+    def __init__(self, a: int, b: str):
+        self.a = a
+        self.b = b
+    # WARNING: this is just a simple stand in for rust classes and is not a good
+    # reference for how such a method should be implemented in python
+    def replace(self, **kwargs: Union[int, str, Optional[TestA]]) -> TestC:
+        ret = TestC(copy.deepcopy(self.a), copy.deepcopy(self.b))
+        for key, value in kwargs.items():
+            if key == "a":
+                ret.a = value  # type: ignore[assignment]
+            elif key == "b":  # pragma: no cover
+                ret.b = value  # type: ignore[assignment]
+            else:  # pragma: no cover
+                raise TypeError(f"unknown field {key}")
+        return ret
+@dataclass
+class TestA:
+    a: int
+    b: str
+    c: List[int]
+    d: Optional[TestC]
+class TestB:
+    a: int
+    b: str
+    c: Optional[TestA]
+    def __init__(self, a: int, b: str, c: Optional[TestA]):
+        self.a = a
+        self.b = b
+        self.c = c
+    # WARNING: this is just a simple stand in for rust classes and is not a good
+    # reference for how such a method should be implemented in python
+    def replace(self, **kwargs: Union[int, str, Optional[TestA]]) -> TestB:
+        ret = TestB(copy.deepcopy(self.a), copy.deepcopy(self.b), copy.deepcopy(self.c))
+        for key, value in kwargs.items():
+            if key == "a":  # pragma: no cover
+                ret.a = value  # type: ignore[assignment]
+            elif key == "b":
+                ret.b = value  # type: ignore[assignment]
+            elif key == "c":
+                ret.c = value  # type: ignore[assignment]
+            else:
+                raise TypeError(f"unknown field {key}")
+        return ret
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, TestB):
+            return self.a == other.a and self.b == other.b and self.c == self.c
+        else:
+            return False  # pragma: no cover
+def test_recursive_replace_dataclass() -> None:
+    a = TestA(42, "foobar", [1337, 42], None)
+    a2 = recursive_replace(a, "b", "barfoo")
+    assert a.a == a2.a
+    assert a.b == "foobar"
+    assert a2.b == "barfoo"
+    assert a.c == a2.c
+def test_recursive_replace_other() -> None:
+    b = TestB(42, "foobar", None)
+    b2 = recursive_replace(b, "b", "barfoo")
+    assert b.a == b2.a
+    assert b.b == "foobar"
+    assert b2.b == "barfoo"
+    assert b.c == b2.c
+def test_recursive_replace() -> None:
+    b1 = TestB(42, "foobar", TestA(1337, "barfoo", [1, 2, 3], None))
+    b2 = recursive_replace(b1, "c.a", 110)
+    assert b1 == TestB(42, "foobar", TestA(1337, "barfoo", [1, 2, 3], None))
+    assert b2 == TestB(42, "foobar", TestA(110, "barfoo", [1, 2, 3], None))
+def test_recursive_replace2() -> None:
+    b1 = TestB(42, "foobar", TestA(1337, "barfoo", [1, 2, 3], TestC(123, "345")))
+    b2 = recursive_replace(b1, "c.d.a", 110)
+    assert b1 == TestB(42, "foobar", TestA(1337, "barfoo", [1, 2, 3], TestC(123, "345")))
+    assert b2 == TestB(42, "foobar", TestA(1337, "barfoo", [1, 2, 3], TestC(110, "345")))
+def test_recursive_replace_unknown() -> None:
+    b = TestB(42, "foobar", TestA(1337, "barfoo", [1, 2, 3], None))
+    with pytest.raises(TypeError):
+        recursive_replace(b, "c.foobar", 110)
+    with pytest.raises(TypeError):
+        recursive_replace(b, "foobar", 110)

tests/wallet/cat_wallet/test_cat_wallet.py CHANGED Viewed

         @@@ -3,7 -3,7 +3,6 @@@ from __future__ import annotation
 import asyncio
 import tempfile
 from pathlib import Path
-from typing import List
 import pytest
         @@@ -11,7 -11,7 +10,6 @@@ from chia.consensus.block_rewards impor
 from chia.protocols.wallet_protocol import CoinState
 from chia.rpc.wallet_rpc_api import WalletRpcApi
 from chia.rpc.wallet_rpc_client import WalletRpcClient
-from chia.simulator.full_node_simulator import FullNodeSimulator
 from chia.simulator.simulator_protocol import FarmNewBlockProtocol, ReorgProtocol
 from chia.types.blockchain_format.coin import Coin, coin_as_list
 from chia.types.blockchain_format.program import Program
         @@@ -29,14 -29,14 +27,14 @@@ from chia.wallet.derivation_record impo
 from chia.wallet.derive_keys import _derive_path_unhardened, master_sk_to_wallet_sk_unhardened_intermediate
 from chia.wallet.lineage_proof import LineageProof
 from chia.wallet.puzzles.p2_delegated_puzzle_or_hidden_puzzle import puzzle_hash_for_pk
-from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.tx_config import DEFAULT_COIN_SELECTION_CONFIG, DEFAULT_TX_CONFIG
 from chia.wallet.util.wallet_types import WalletType
 from chia.wallet.wallet_info import WalletInfo
 from chia.wallet.wallet_interested_store import WalletInterestedStore
 from chia.wallet.wallet_node import WalletNode
+from chia.wallet.wallet_state_manager import WalletStateManager
 from tests.conftest import ConsensusMode
-from tests.util.setup_nodes import SimulatorsAndWalletsServices
+from tests.util.setup_nodes import OldSimulatorsAndWallets, SimulatorsAndWalletsServices
 from tests.util.time_out_assert import time_out_assert, time_out_assert_not_none
         @@@ -44,1016 -44,1016 +42,955 @@@ def check_wallets(node: WalletNode) ->
     return len(node.wallet_state_manager.wallets.keys())
-class TestCATWallet:
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
-    )
-    @pytest.mark.anyio
-    async def test_cat_creation(self, self_hostname, two_wallet_nodes, trusted):
-        num_blocks = 3
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node, server_2 = wallets[0]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
-        if trusted:
-            wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        else:
-            wallet_node.config["trusted_peers"] = {}
-        await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"0"))
-        funds = sum(
-            [
-                calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i))
-                for i in range(1, num_blocks + 1)
-            ]
-        )
-        await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        async with wallet_node.wallet_state_manager.lock:
-            cat_wallet, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                {"identifier": "genesis_by_id"},
-                uint64(100),
-                DEFAULT_TX_CONFIG,
-                fee=uint64(10),
-            )
-            # The next 2 lines are basically a noop, it just adds test coverage
-            cat_wallet = await CATWallet.create(wallet_node.wallet_state_manager, wallet, cat_wallet.wallet_info)
-            await wallet_node.wallet_state_manager.add_new_wallet(cat_wallet)
-        tx_queue: List[TransactionRecord] = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
-        tx_record = tx_queue[0]
-        await full_node_api.process_transaction_records(records=[tx_record])
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
-        await time_out_assert(20, cat_wallet.get_spendable_balance, 100)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
-        await time_out_assert(20, wallet.get_confirmed_balance, funds - 110)
-        await time_out_assert(20, wallet.get_spendable_balance, funds - 110)
-        await time_out_assert(20, wallet.get_unconfirmed_balance, funds - 110)
-        # Test migration
-        all_lineage = await cat_wallet.lineage_store.get_all_lineage_proofs()
-        current_info = cat_wallet.wallet_info
-        data_str = bytes(
-            LegacyCATInfo(
-                cat_wallet.cat_info.limitations_program_hash, cat_wallet.cat_info.my_tail, list(all_lineage.items())
-            )
-        ).hex()
-        wallet_info = WalletInfo(current_info.id, current_info.name, current_info.type, data_str)
-        new_cat_wallet = await CATWallet.create(wallet_node.wallet_state_manager, wallet, wallet_info)
-        assert new_cat_wallet.cat_info.limitations_program_hash == cat_wallet.cat_info.limitations_program_hash
-        assert new_cat_wallet.cat_info.my_tail == cat_wallet.cat_info.my_tail
-        assert await cat_wallet.lineage_store.get_all_lineage_proofs() == all_lineage
-        height = full_node_api.full_node.blockchain.get_peak_height()
-        await full_node_api.reorg_from_index_to_new_index(
-            ReorgProtocol(height - num_blocks - 1, height + 1, 32 * b"1", None)
-        )
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 0)
-    @pytest.mark.anyio
-    async def test_cat_creation_unique_lineage_store(self, self_hostname, two_wallet_nodes):
-        num_blocks = 3
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node, wallet_server = wallets[0]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.anyio
+async def test_cat_creation(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
+    num_blocks = 3
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node, server_2 = wallets[0]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
+    if trusted:
         wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    else:
+        wallet_node.config["trusted_peers"] = {}
-        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"0"))
+    await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for _ in range(num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"0")))
-        funds = sum(
-            [
-                calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i))
-                for i in range(1, num_blocks + 1)
-            ]
-        )
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks + 1)]
+    )
+    await time_out_assert(20, wallet.get_confirmed_balance, funds)
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        async with wallet_node.wallet_state_manager.lock:
-            cat_wallet_1, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                {"identifier": "genesis_by_id"},
-                uint64(100),
-                DEFAULT_TX_CONFIG,
-            )
-            cat_wallet_2, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                {"identifier": "genesis_by_id"},
-                uint64(200),
-                DEFAULT_TX_CONFIG,
-            )
-        proofs_1 = await cat_wallet_1.lineage_store.get_all_lineage_proofs()
-        proofs_2 = await cat_wallet_2.lineage_store.get_all_lineage_proofs()
-        assert len(proofs_1) == len(proofs_2)
-        assert proofs_1 != proofs_2
-        assert cat_wallet_1.lineage_store.table_name != cat_wallet_2.lineage_store.table_name
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
+    async with wallet_node.wallet_state_manager.lock:
+        cat_wallet, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            {"identifier": "genesis_by_id"},
+            uint64(100),
+            DEFAULT_TX_CONFIG,
+            fee=uint64(10),
+        )
+        # The next 2 lines are basically a noop, it just adds test coverage
+        cat_wallet = await CATWallet.create(wallet_node.wallet_state_manager, wallet, cat_wallet.wallet_info)
+        await wallet_node.wallet_state_manager.add_new_wallet(cat_wallet)
+    tx_queue = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
+    tx_record = tx_queue[0]
+    await full_node_api.process_transaction_records(records=[tx_record])
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
+    await time_out_assert(20, cat_wallet.get_spendable_balance, 100)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
+    await time_out_assert(20, wallet.get_confirmed_balance, funds - 110)
+    await time_out_assert(20, wallet.get_spendable_balance, funds - 110)
+    await time_out_assert(20, wallet.get_unconfirmed_balance, funds - 110)
+    # Test migration
+    all_lineage = await cat_wallet.lineage_store.get_all_lineage_proofs()
+    current_info = cat_wallet.wallet_info
+    data_str = bytes(
+        LegacyCATInfo(
+            cat_wallet.cat_info.limitations_program_hash, cat_wallet.cat_info.my_tail, list(all_lineage.items())
+        )
+    ).hex()
+    wallet_info = WalletInfo(current_info.id, current_info.name, current_info.type, data_str)
+    new_cat_wallet = await CATWallet.create(wallet_node.wallet_state_manager, wallet, wallet_info)
+    assert new_cat_wallet.cat_info.limitations_program_hash == cat_wallet.cat_info.limitations_program_hash
+    assert new_cat_wallet.cat_info.my_tail == cat_wallet.cat_info.my_tail
+    assert await cat_wallet.lineage_store.get_all_lineage_proofs() == all_lineage
+    height = full_node_api.full_node.blockchain.get_peak_height()
+    assert height is not None
+    await full_node_api.reorg_from_index_to_new_index(
+        ReorgProtocol(uint32(height - num_blocks - 1), uint32(height + 1), bytes32(32 * b"1"), None)
     )
-    @pytest.mark.anyio
-    async def test_cat_spend(self, self_hostname, two_wallet_nodes, trusted):
-        num_blocks = 3
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node, server_2 = wallets[0]
-        wallet_node_2, server_3 = wallets[1]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        wallet2 = wallet_node_2.wallet_state_manager.main_wallet
-        api_0 = WalletRpcApi(wallet_node)
-        api_1 = WalletRpcApi(wallet_node_2)
-        ph = await wallet.get_new_puzzlehash()
-        if trusted:
-            wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-            wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        else:
-            wallet_node.config["trusted_peers"] = {}
-            wallet_node_2.config["trusted_peers"] = {}
-        await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"0"))
-        funds = sum(
-            [
-                calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i))
-                for i in range(1, num_blocks + 1)
-            ]
-        )
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 0)
-        await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        async with wallet_node.wallet_state_manager.lock:
-            cat_wallet, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                {"identifier": "genesis_by_id"},
-                uint64(100),
-                DEFAULT_TX_CONFIG,
-            )
-        tx_queue: List[TransactionRecord] = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
-        tx_record = tx_queue[0]
-        await full_node_api.process_transaction_records(records=[tx_record])
+@pytest.mark.anyio
+async def test_cat_creation_unique_lineage_store(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets) -> None:
+    num_blocks = 3
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node, wallet_server = wallets[0]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
+    wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for _ in range(num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"0")))
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks + 1)]
+    )
-        assert cat_wallet.cat_info.limitations_program_hash is not None
-        asset_id = cat_wallet.get_asset_id()
+    await time_out_assert(20, wallet.get_confirmed_balance, funds)
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        cat_wallet_2: CATWallet = await CATWallet.get_or_create_wallet_for_cat(
-            wallet_node_2.wallet_state_manager, wallet2, asset_id
+    async with wallet_node.wallet_state_manager.lock:
+        cat_wallet_1, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            {"identifier": "genesis_by_id"},
+            uint64(100),
+            DEFAULT_TX_CONFIG,
+        )
+        cat_wallet_2, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            {"identifier": "genesis_by_id"},
+            uint64(200),
+            DEFAULT_TX_CONFIG,
         )
-        assert cat_wallet.cat_info.limitations_program_hash == cat_wallet_2.cat_info.limitations_program_hash
+    proofs_1 = await cat_wallet_1.lineage_store.get_all_lineage_proofs()
+    proofs_2 = await cat_wallet_2.lineage_store.get_all_lineage_proofs()
+    assert len(proofs_1) == len(proofs_2)
+    assert proofs_1 != proofs_2
+    assert cat_wallet_1.lineage_store.table_name != cat_wallet_2.lineage_store.table_name
-        cat_2_hash = await cat_wallet_2.get_new_inner_hash()
-        tx_records = await cat_wallet.generate_signed_transaction(
-            [uint64(60)], [cat_2_hash], DEFAULT_TX_CONFIG, fee=uint64(1)
-        )
-        tx_id = None
-        await wallet.wallet_state_manager.add_pending_transactions(tx_records)
-        for tx_record in tx_records:
-            if tx_record.wallet_id is cat_wallet.id():
-                tx_id = tx_record.name.hex()
-                assert tx_record.to_puzzle_hash == cat_2_hash
-        await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records)
-        await time_out_assert(20, cat_wallet.get_pending_change_balance, 40)
-        memos = await api_0.get_transaction_memo(dict(transaction_id=tx_id))
-        assert len(memos[tx_id]) == 2  # One for tx, one for change
-        assert list(memos[tx_id].values())[0][0] == cat_2_hash.hex()
-        for i in range(1, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"\0"))
-        await time_out_assert(30, wallet.get_confirmed_balance, funds - 101)
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 40)
-        await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 60)
-        await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 60)
-        coins = await cat_wallet_2.select_coins(uint64(60), DEFAULT_COIN_SELECTION_CONFIG)
-        assert len(coins) == 1
-        coin = coins.pop()
-        tx_id = coin.name().hex()
-        memos = await api_1.get_transaction_memo(dict(transaction_id=tx_id))
-        assert len(memos[tx_id]) == 2
-        assert list(memos[tx_id].values())[0][0] == cat_2_hash.hex()
-        cat_hash = await cat_wallet.get_new_inner_hash()
-        tx_records = await cat_wallet_2.generate_signed_transaction([uint64(15)], [cat_hash], DEFAULT_TX_CONFIG)
-        await wallet.wallet_state_manager.add_pending_transactions(tx_records)
-        await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records)
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.anyio
+async def test_cat_spend(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
+    num_blocks = 3
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node, server_2 = wallets[0]
+    wallet_node_2, server_3 = wallets[1]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    wallet2 = wallet_node_2.wallet_state_manager.main_wallet
+    api_0 = WalletRpcApi(wallet_node)
+    api_1 = WalletRpcApi(wallet_node_2)
+    ph = await wallet.get_new_puzzlehash()
+    if trusted:
+        wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+        wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    else:
+        wallet_node.config["trusted_peers"] = {}
+        wallet_node_2.config["trusted_peers"] = {}
+    await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for _ in range(num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"0")))
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 55)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 55)
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks + 1)]
+    )
-        height = full_node_api.full_node.blockchain.get_peak_height()
-        await full_node_api.reorg_from_index_to_new_index(ReorgProtocol(height - 1, height + 1, 32 * b"1", None))
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
+    await time_out_assert(20, wallet.get_confirmed_balance, funds)
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
-    )
-    @pytest.mark.anyio
-    async def test_cat_reuse_address(self, self_hostname, two_wallet_nodes, trusted):
-        num_blocks = 3
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node, server_2 = wallets[0]
-        wallet_node_2, server_3 = wallets[1]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        wallet2 = wallet_node_2.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
-        if trusted:
-            wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-            wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        else:
-            wallet_node.config["trusted_peers"] = {}
-            wallet_node_2.config["trusted_peers"] = {}
-        await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"0"))
-        funds = sum(
-            [
-                calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i))
-                for i in range(1, num_blocks + 1)
-            ]
+    async with wallet_node.wallet_state_manager.lock:
+        cat_wallet, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            {"identifier": "genesis_by_id"},
+            uint64(100),
+            DEFAULT_TX_CONFIG,
         )
+    tx_queue = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
+    tx_record = tx_queue[0]
+    await full_node_api.process_transaction_records(records=[tx_record])
-        await time_out_assert(20, wallet.get_confirmed_balance, funds)
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
-        async with wallet_node.wallet_state_manager.lock:
-            cat_wallet, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                {"identifier": "genesis_by_id"},
-                uint64(100),
-                DEFAULT_TX_CONFIG,
-            )
-        tx_queue: List[TransactionRecord] = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
-        tx_record = tx_queue[0]
-        await full_node_api.process_transaction_records(records=[tx_record])
+    assert cat_wallet.cat_info.limitations_program_hash is not None
+    asset_id = cat_wallet.get_asset_id()
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
+    cat_wallet_2 = await CATWallet.get_or_create_wallet_for_cat(wallet_node_2.wallet_state_manager, wallet2, asset_id)
-        assert cat_wallet.cat_info.limitations_program_hash is not None
-        asset_id = cat_wallet.get_asset_id()
+    assert cat_wallet.cat_info.limitations_program_hash == cat_wallet_2.cat_info.limitations_program_hash
-        cat_wallet_2: CATWallet = await CATWallet.get_or_create_wallet_for_cat(
-            wallet_node_2.wallet_state_manager, wallet2, asset_id
-        )
+    cat_2_hash = await cat_wallet_2.get_new_inner_hash()
+    tx_records = await cat_wallet.generate_signed_transaction(
+        [uint64(60)], [cat_2_hash], DEFAULT_TX_CONFIG, fee=uint64(1)
+    )
+    tx_id = None
+    tx_records = await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    for tx_record in tx_records:
+        if tx_record.wallet_id is cat_wallet.id():
+            tx_id = tx_record.name.hex()
+            assert tx_record.to_puzzle_hash == cat_2_hash
+    await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records)
+    await time_out_assert(20, cat_wallet.get_pending_change_balance, 40)
+    assert tx_id is not None
+    memos = await api_0.get_transaction_memo({"transaction_id": tx_id})
+    assert len(memos[tx_id]) == 2  # One for tx, one for change
+    assert list(memos[tx_id].values())[0][0] == cat_2_hash.hex()
+    for _ in range(1, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"\0")))
+    await time_out_assert(30, wallet.get_confirmed_balance, funds - 101)
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 40)
+    await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 60)
+    await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 60)
+    coins = await cat_wallet_2.select_coins(uint64(60), DEFAULT_COIN_SELECTION_CONFIG)
+    assert len(coins) == 1
+    coin = coins.pop()
+    tx_id = coin.name().hex()
+    memos = await api_1.get_transaction_memo(dict(transaction_id=tx_id))
+    assert len(memos[tx_id]) == 2
+    assert list(memos[tx_id].values())[0][0] == cat_2_hash.hex()
+    cat_hash = await cat_wallet.get_new_inner_hash()
+    tx_records = await cat_wallet_2.generate_signed_transaction([uint64(15)], [cat_hash], DEFAULT_TX_CONFIG)
+    tx_records = await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 55)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 55)
+    height = full_node_api.full_node.blockchain.get_peak_height()
+    assert height is not None
+    await full_node_api.reorg_from_index_to_new_index(
+        ReorgProtocol(uint32(height - 1), uint32(height + 1), bytes32(32 * b"1"), None)
+    )
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.anyio
+async def test_cat_reuse_address(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
+    num_blocks = 3
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node, server_2 = wallets[0]
+    wallet_node_2, server_3 = wallets[1]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    wallet2 = wallet_node_2.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
+    if trusted:
+        wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+        wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    else:
+        wallet_node.config["trusted_peers"] = {}
+        wallet_node_2.config["trusted_peers"] = {}
+    await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for _ in range(num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"0")))
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks + 1)]
+    )
-        assert cat_wallet.cat_info.limitations_program_hash == cat_wallet_2.cat_info.limitations_program_hash
+    await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        cat_2_hash = await cat_wallet_2.get_new_inner_hash()
-        tx_records = await cat_wallet.generate_signed_transaction(
-            [uint64(60)], [cat_2_hash], DEFAULT_TX_CONFIG.override(reuse_puzhash=True), fee=uint64(1)
+    async with wallet_node.wallet_state_manager.lock:
+        cat_wallet, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            {"identifier": "genesis_by_id"},
+            uint64(100),
+            DEFAULT_TX_CONFIG,
         )
-        await wallet.wallet_state_manager.add_pending_transactions(tx_records)
-        for tx_record in tx_records:
-            if tx_record.wallet_id is cat_wallet.id():
-                assert tx_record.to_puzzle_hash == cat_2_hash
-                assert len(tx_record.spend_bundle.coin_spends) == 2
-                for cs in tx_record.spend_bundle.coin_spends:
-                    if cs.coin.amount == 100:
-                        old_puzhash = cs.coin.puzzle_hash.hex()
-                new_puzhash = [c.puzzle_hash.hex() for c in tx_record.additions]
-                assert old_puzhash in new_puzhash
+    tx_queue = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
+    tx_record = tx_queue[0]
+    await full_node_api.process_transaction_records(records=[tx_record])
-        await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records)
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
-        await time_out_assert(20, cat_wallet.get_pending_change_balance, 40)
+    assert cat_wallet.cat_info.limitations_program_hash is not None
+    asset_id = cat_wallet.get_asset_id()
-        for i in range(1, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"\0"))
+    cat_wallet_2 = await CATWallet.get_or_create_wallet_for_cat(wallet_node_2.wallet_state_manager, wallet2, asset_id)
-        await time_out_assert(30, wallet.get_confirmed_balance, funds - 101)
+    assert cat_wallet.cat_info.limitations_program_hash == cat_wallet_2.cat_info.limitations_program_hash
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 40)
+    cat_2_hash = await cat_wallet_2.get_new_inner_hash()
+    tx_records = await cat_wallet.generate_signed_transaction(
+        [uint64(60)], [cat_2_hash], DEFAULT_TX_CONFIG.override(reuse_puzhash=True), fee=uint64(1)
+    )
+    await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    for tx_record in tx_records:
+        if tx_record.wallet_id is cat_wallet.id():
+            assert tx_record.to_puzzle_hash == cat_2_hash
+            assert tx_record.spend_bundle is not None
+            assert len(tx_record.spend_bundle.coin_spends) == 2
+            for cs in tx_record.spend_bundle.coin_spends:
+                if cs.coin.amount == 100:
+                    old_puzhash = cs.coin.puzzle_hash.hex()
+            new_puzhash = [c.puzzle_hash.hex() for c in tx_record.additions]
+            assert old_puzhash in new_puzhash
-        await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 60)
-        await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 60)
+    await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records)
-        cat_hash = await cat_wallet.get_new_inner_hash()
-        tx_records = await cat_wallet_2.generate_signed_transaction([uint64(15)], [cat_hash], DEFAULT_TX_CONFIG)
-        await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    await time_out_assert(20, cat_wallet.get_pending_change_balance, 40)
-        await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records)
+    for _ in range(1, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"\0")))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await time_out_assert(30, wallet.get_confirmed_balance, funds - 101)
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 40)
+    await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 60)
+    await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 60)
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 55)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 55)
+    cat_hash = await cat_wallet.get_new_inner_hash()
+    tx_records = await cat_wallet_2.generate_signed_transaction([uint64(15)], [cat_hash], DEFAULT_TX_CONFIG)
+    await wallet.wallet_state_manager.add_pending_transactions(tx_records)
-        height = full_node_api.full_node.blockchain.get_peak_height()
-        await full_node_api.reorg_from_index_to_new_index(ReorgProtocol(height - 1, height + 1, 32 * b"1", None))
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
+    await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records)
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 55)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 55)
+    height = full_node_api.full_node.blockchain.get_peak_height()
+    assert height is not None
+    await full_node_api.reorg_from_index_to_new_index(
+        ReorgProtocol(uint32(height - 1), uint32(height + 1), bytes32(32 * b"1"), None)
     )
-    @pytest.mark.anyio
-    async def test_get_wallet_for_asset_id(self, self_hostname, two_wallet_nodes, trusted):
-        num_blocks = 3
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node, server_2 = wallets[0]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
-        if trusted:
-            wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        else:
-            wallet_node.config["trusted_peers"] = {}
-        await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"0"))
-        funds = sum(
-            [
-                calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i))
-                for i in range(1, num_blocks + 1)
-            ]
-        )
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
-        await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        async with wallet_node.wallet_state_manager.lock:
-            cat_wallet, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                {"identifier": "genesis_by_id"},
-                uint64(100),
-                DEFAULT_TX_CONFIG,
-            )
-        for i in range(1, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"0"))
-        asset_id = cat_wallet.get_asset_id()
-        await cat_wallet.set_tail_program(bytes(cat_wallet.cat_info.my_tail).hex())
-        assert await wallet_node.wallet_state_manager.get_wallet_for_asset_id(asset_id) == cat_wallet
-        # Test that the a default CAT will initialize correctly
-        asset = DEFAULT_CATS[next(iter(DEFAULT_CATS))]
-        asset_id = asset["asset_id"]
-        cat_wallet_2 = await CATWallet.get_or_create_wallet_for_cat(wallet_node.wallet_state_manager, wallet, asset_id)
-        assert cat_wallet_2.get_name() == asset["name"]
-        await cat_wallet_2.set_name("Test Name")
-        assert cat_wallet_2.get_name() == "Test Name"
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.anyio
+async def test_get_wallet_for_asset_id(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
+    num_blocks = 3
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node, server_2 = wallets[0]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
+    if trusted:
+        wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    else:
+        wallet_node.config["trusted_peers"] = {}
+    await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for _ in range(num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"0")))
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks + 1)]
     )
-    @pytest.mark.anyio
-    async def test_cat_doesnt_see_eve(self, self_hostname, two_wallet_nodes, trusted):
-        num_blocks = 3
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node, server_2 = wallets[0]
-        wallet_node_2, server_3 = wallets[1]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        wallet2 = wallet_node_2.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
-        if trusted:
-            wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-            wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        else:
-            wallet_node.config["trusted_peers"] = {}
-            wallet_node_2.config["trusted_peers"] = {}
-        await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"0"))
-        funds = sum(
-            [
-                calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i))
-                for i in range(1, num_blocks + 1)
-            ]
+    await time_out_assert(20, wallet.get_confirmed_balance, funds)
+    async with wallet_node.wallet_state_manager.lock:
+        cat_wallet, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            {"identifier": "genesis_by_id"},
+            uint64(100),
+            DEFAULT_TX_CONFIG,
         )
-        await time_out_assert(20, wallet.get_confirmed_balance, funds)
+    for _ in range(1, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"0")))
-        async with wallet_node.wallet_state_manager.lock:
-            cat_wallet, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                {"identifier": "genesis_by_id"},
-                uint64(100),
-                DEFAULT_TX_CONFIG,
-            )
-        tx_records: List[TransactionRecord] = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
-        await full_node_api.process_transaction_records(records=tx_records)
+    asset_id = cat_wallet.get_asset_id()
+    assert cat_wallet.cat_info.my_tail is not None
+    await cat_wallet.set_tail_program(bytes(cat_wallet.cat_info.my_tail).hex())
+    assert await wallet_node.wallet_state_manager.get_wallet_for_asset_id(asset_id) == cat_wallet
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
+    # Test that the a default CAT will initialize correctly
+    asset = DEFAULT_CATS[next(iter(DEFAULT_CATS))]
+    asset_id = asset["asset_id"]
+    cat_wallet_2 = await CATWallet.get_or_create_wallet_for_cat(wallet_node.wallet_state_manager, wallet, asset_id)
+    assert cat_wallet_2.get_name() == asset["name"]
+    await cat_wallet_2.set_name("Test Name")
+    assert cat_wallet_2.get_name() == "Test Name"
-        assert cat_wallet.cat_info.limitations_program_hash is not None
-        asset_id = cat_wallet.get_asset_id()
-        cat_wallet_2: CATWallet = await CATWallet.get_or_create_wallet_for_cat(
-            wallet_node_2.wallet_state_manager, wallet2, asset_id
-        )
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.anyio
+async def test_cat_doesnt_see_eve(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
+    num_blocks = 3
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node, server_2 = wallets[0]
+    wallet_node_2, server_3 = wallets[1]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    wallet2 = wallet_node_2.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
+    if trusted:
+        wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+        wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    else:
+        wallet_node.config["trusted_peers"] = {}
+        wallet_node_2.config["trusted_peers"] = {}
+    await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for _ in range(num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"0")))
-        assert cat_wallet.cat_info.limitations_program_hash == cat_wallet_2.cat_info.limitations_program_hash
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks + 1)]
+    )
+    await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        cat_2_hash = await cat_wallet_2.get_new_inner_hash()
-        tx_records = await cat_wallet.generate_signed_transaction(
-            [uint64(60)], [cat_2_hash], DEFAULT_TX_CONFIG, fee=uint64(1)
+    async with wallet_node.wallet_state_manager.lock:
+        cat_wallet, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            {"identifier": "genesis_by_id"},
+            uint64(100),
+            DEFAULT_TX_CONFIG,
         )
-        await wallet.wallet_state_manager.add_pending_transactions(tx_records)
-        await full_node_api.process_transaction_records(records=tx_records)
+    tx_records = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
+    await full_node_api.process_transaction_records(records=tx_records)
-        await time_out_assert(30, wallet.get_confirmed_balance, funds - 101)
-        await time_out_assert(30, wallet.get_unconfirmed_balance, funds - 101)
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 40)
+    assert cat_wallet.cat_info.limitations_program_hash is not None
+    asset_id = cat_wallet.get_asset_id()
-        await time_out_assert(20, cat_wallet_2.get_confirmed_balance, 60)
-        await time_out_assert(20, cat_wallet_2.get_unconfirmed_balance, 60)
+    cat_wallet_2 = await CATWallet.get_or_create_wallet_for_cat(wallet_node_2.wallet_state_manager, wallet2, asset_id)
-        cc2_ph = await cat_wallet_2.get_new_cat_puzzle_hash()
-        [tx_record] = await wallet.wallet_state_manager.main_wallet.generate_signed_transaction(
-            10, cc2_ph, DEFAULT_TX_CONFIG, 0
-        )
-        await wallet.wallet_state_manager.add_pending_transactions([tx_record])
-        await full_node_api.process_transaction_records(records=[tx_record])
+    assert cat_wallet.cat_info.limitations_program_hash == cat_wallet_2.cat_info.limitations_program_hash
-        id = cat_wallet_2.id()
-        wsm = cat_wallet_2.wallet_state_manager
+    cat_2_hash = await cat_wallet_2.get_new_inner_hash()
+    tx_records = await cat_wallet.generate_signed_transaction(
+        [uint64(60)], [cat_2_hash], DEFAULT_TX_CONFIG, fee=uint64(1)
+    )
+    await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    await full_node_api.process_transaction_records(records=tx_records)
+    await time_out_assert(30, wallet.get_confirmed_balance, funds - 101)
+    await time_out_assert(30, wallet.get_unconfirmed_balance, funds - 101)
-        async def query_and_assert_transactions(wsm, id):
-            all_txs = await wsm.tx_store.get_all_transactions_for_wallet(id)
-            return len(list(filter(lambda tx: tx.amount == 10, all_txs)))
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 40)
-        await time_out_assert(20, query_and_assert_transactions, 0, wsm, id)
-        await time_out_assert(20, wsm.get_confirmed_balance_for_wallet, 60, id)
-        await time_out_assert(20, cat_wallet_2.get_confirmed_balance, 60)
-        await time_out_assert(20, cat_wallet_2.get_unconfirmed_balance, 60)
+    await time_out_assert(20, cat_wallet_2.get_confirmed_balance, 60)
+    await time_out_assert(20, cat_wallet_2.get_unconfirmed_balance, 60)
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
+    cc2_ph = await cat_wallet_2.get_new_cat_puzzle_hash()
+    [tx_record] = await wallet.wallet_state_manager.main_wallet.generate_signed_transaction(
+        uint64(10), cc2_ph, DEFAULT_TX_CONFIG
     )
-    @pytest.mark.anyio
-    async def test_cat_spend_multiple(self, self_hostname, three_wallet_nodes, trusted):
-        num_blocks = 3
-        full_nodes, wallets, _ = three_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node_0, wallet_server_0 = wallets[0]
-        wallet_node_1, wallet_server_1 = wallets[1]
-        wallet_node_2, wallet_server_2 = wallets[2]
-        wallet_0 = wallet_node_0.wallet_state_manager.main_wallet
-        wallet_1 = wallet_node_1.wallet_state_manager.main_wallet
-        wallet_2 = wallet_node_2.wallet_state_manager.main_wallet
-        ph = await wallet_0.get_new_puzzlehash()
-        if trusted:
-            wallet_node_0.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-            wallet_node_1.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-            wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        else:
-            wallet_node_0.config["trusted_peers"] = {}
-            wallet_node_1.config["trusted_peers"] = {}
-            wallet_node_2.config["trusted_peers"] = {}
-        await wallet_server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        await wallet_server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        await wallet_server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        funds = sum(
-            [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks)]
-        )
+    await wallet.wallet_state_manager.add_pending_transactions([tx_record])
+    await full_node_api.process_transaction_records(records=[tx_record])
-        await time_out_assert(20, wallet_0.get_confirmed_balance, funds)
+    id = cat_wallet_2.id()
+    wsm = cat_wallet_2.wallet_state_manager
-        async with wallet_node_0.wallet_state_manager.lock:
-            cat_wallet_0, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node_0.wallet_state_manager,
-                wallet_0,
-                {"identifier": "genesis_by_id"},
-                uint64(100),
-                DEFAULT_TX_CONFIG,
-            )
-        tx_records: List[TransactionRecord] = await wallet_node_0.wallet_state_manager.tx_store.get_not_sent()
-        await full_node_api.process_transaction_records(records=tx_records)
+    async def query_and_assert_transactions(wsm: WalletStateManager, id: uint32) -> int:
+        all_txs = await wsm.tx_store.get_all_transactions_for_wallet(id)
+        return len(list(filter(lambda tx: tx.amount == 10, all_txs)))
-        await time_out_assert(20, cat_wallet_0.get_confirmed_balance, 100)
-        await time_out_assert(20, cat_wallet_0.get_unconfirmed_balance, 100)
+    await time_out_assert(20, query_and_assert_transactions, 0, wsm, id)
+    await time_out_assert(20, wsm.get_confirmed_balance_for_wallet, 60, id)
+    await time_out_assert(20, cat_wallet_2.get_confirmed_balance, 60)
+    await time_out_assert(20, cat_wallet_2.get_unconfirmed_balance, 60)
-        assert cat_wallet_0.cat_info.limitations_program_hash is not None
-        asset_id = cat_wallet_0.get_asset_id()
-        cat_wallet_1: CATWallet = await CATWallet.get_or_create_wallet_for_cat(
-            wallet_node_1.wallet_state_manager, wallet_1, asset_id
-        )
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.anyio
+async def test_cat_spend_multiple(
+    self_hostname: str, three_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
+    num_blocks = 3
+    full_nodes, wallets, _ = three_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node_0, wallet_server_0 = wallets[0]
+    wallet_node_1, wallet_server_1 = wallets[1]
+    wallet_node_2, wallet_server_2 = wallets[2]
+    wallet_0 = wallet_node_0.wallet_state_manager.main_wallet
+    wallet_1 = wallet_node_1.wallet_state_manager.main_wallet
+    wallet_2 = wallet_node_2.wallet_state_manager.main_wallet
+    ph = await wallet_0.get_new_puzzlehash()
+    if trusted:
+        wallet_node_0.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+        wallet_node_1.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+        wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    else:
+        wallet_node_0.config["trusted_peers"] = {}
+        wallet_node_1.config["trusted_peers"] = {}
+        wallet_node_2.config["trusted_peers"] = {}
+    await wallet_server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await wallet_server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await wallet_server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for _ in range(num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks)]
+    )
-        cat_wallet_2: CATWallet = await CATWallet.get_or_create_wallet_for_cat(
-            wallet_node_2.wallet_state_manager, wallet_2, asset_id
+    await time_out_assert(20, wallet_0.get_confirmed_balance, funds)
+    async with wallet_node_0.wallet_state_manager.lock:
+        cat_wallet_0, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_0,
+            {"identifier": "genesis_by_id"},
+            uint64(100),
+            DEFAULT_TX_CONFIG,
         )
+    tx_records = await wallet_node_0.wallet_state_manager.tx_store.get_not_sent()
+    await full_node_api.process_transaction_records(records=tx_records)
-        assert cat_wallet_0.cat_info.limitations_program_hash == cat_wallet_1.cat_info.limitations_program_hash
-        assert cat_wallet_0.cat_info.limitations_program_hash == cat_wallet_2.cat_info.limitations_program_hash
+    await time_out_assert(20, cat_wallet_0.get_confirmed_balance, 100)
+    await time_out_assert(20, cat_wallet_0.get_unconfirmed_balance, 100)
-        cat_1_hash = await cat_wallet_1.get_new_inner_hash()
-        cat_2_hash = await cat_wallet_2.get_new_inner_hash()
+    assert cat_wallet_0.cat_info.limitations_program_hash is not None
+    asset_id = cat_wallet_0.get_asset_id()
-        tx_records = await cat_wallet_0.generate_signed_transaction(
-            [uint64(60), uint64(20)], [cat_1_hash, cat_2_hash], DEFAULT_TX_CONFIG
-        )
-        await wallet_0.wallet_state_manager.add_pending_transactions(tx_records)
-        await full_node_api.process_transaction_records(records=tx_records)
+    cat_wallet_1 = await CATWallet.get_or_create_wallet_for_cat(wallet_node_1.wallet_state_manager, wallet_1, asset_id)
-        await time_out_assert(20, cat_wallet_0.get_confirmed_balance, 20)
-        await time_out_assert(20, cat_wallet_0.get_unconfirmed_balance, 20)
+    cat_wallet_2 = await CATWallet.get_or_create_wallet_for_cat(wallet_node_2.wallet_state_manager, wallet_2, asset_id)
-        await time_out_assert(30, cat_wallet_1.get_confirmed_balance, 60)
-        await time_out_assert(30, cat_wallet_1.get_unconfirmed_balance, 60)
+    assert cat_wallet_0.cat_info.limitations_program_hash == cat_wallet_1.cat_info.limitations_program_hash
+    assert cat_wallet_0.cat_info.limitations_program_hash == cat_wallet_2.cat_info.limitations_program_hash
-        await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 20)
-        await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 20)
+    cat_1_hash = await cat_wallet_1.get_new_inner_hash()
+    cat_2_hash = await cat_wallet_2.get_new_inner_hash()
-        cat_hash = await cat_wallet_0.get_new_inner_hash()
+    tx_records = await cat_wallet_0.generate_signed_transaction(
+        [uint64(60), uint64(20)], [cat_1_hash, cat_2_hash], DEFAULT_TX_CONFIG
+    )
+    await wallet_0.wallet_state_manager.add_pending_transactions(tx_records)
+    await full_node_api.process_transaction_records(records=tx_records)
-        tx_records = await cat_wallet_1.generate_signed_transaction([uint64(15)], [cat_hash], DEFAULT_TX_CONFIG)
-        await wallet_1.wallet_state_manager.add_pending_transactions(tx_records)
+    await time_out_assert(20, cat_wallet_0.get_confirmed_balance, 20)
+    await time_out_assert(20, cat_wallet_0.get_unconfirmed_balance, 20)
-        tx_records_2 = await cat_wallet_2.generate_signed_transaction([uint64(20)], [cat_hash], DEFAULT_TX_CONFIG)
-        await wallet_2.wallet_state_manager.add_pending_transactions(tx_records_2)
+    await time_out_assert(30, cat_wallet_1.get_confirmed_balance, 60)
+    await time_out_assert(30, cat_wallet_1.get_unconfirmed_balance, 60)
-        await full_node_api.process_transaction_records(records=[*tx_records, *tx_records_2])
+    await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 20)
+    await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 20)
-        await time_out_assert(20, cat_wallet_0.get_confirmed_balance, 55)
-        await time_out_assert(20, cat_wallet_0.get_unconfirmed_balance, 55)
+    cat_hash = await cat_wallet_0.get_new_inner_hash()
-        await time_out_assert(30, cat_wallet_1.get_confirmed_balance, 45)
-        await time_out_assert(30, cat_wallet_1.get_unconfirmed_balance, 45)
+    tx_records = await cat_wallet_1.generate_signed_transaction([uint64(15)], [cat_hash], DEFAULT_TX_CONFIG)
+    await wallet_1.wallet_state_manager.add_pending_transactions(tx_records)
-        await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 0)
-        await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 0)
+    tx_records_2 = await cat_wallet_2.generate_signed_transaction([uint64(20)], [cat_hash], DEFAULT_TX_CONFIG)
+    await wallet_2.wallet_state_manager.add_pending_transactions(tx_records_2)
-        txs = await wallet_1.wallet_state_manager.tx_store.get_transactions_between(cat_wallet_1.id(), 0, 100000)
-        # Test with Memo
-        tx_records_3: TransactionRecord = await cat_wallet_1.generate_signed_transaction(
-            [uint64(30)], [cat_hash], DEFAULT_TX_CONFIG, memos=[[b"Markus Walburg"]]
-        )
-        with pytest.raises(ValueError):
-            await cat_wallet_1.generate_signed_transaction(
-                [uint64(30)], [cat_hash], DEFAULT_TX_CONFIG, memos=[[b"too"], [b"many"], [b"memos"]]
-            )
-        await wallet_1.wallet_state_manager.add_pending_transactions(tx_records_3)
-        await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records_3)
-        txs = await wallet_1.wallet_state_manager.tx_store.get_transactions_between(cat_wallet_1.id(), 0, 100000)
-        for tx in txs:
-            if tx.amount == 30:
-                memos = tx.get_memos()
-                assert len(memos) == 2  # One for tx, one for change
-                assert b"Markus Walburg" in [v for v_list in memos.values() for v in v_list]
-                assert list(memos.keys())[0] in [a.name() for a in tx.spend_bundle.additions()]
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN, ConsensusMode.HARD_FORK_2_0], reason="save time")
-    @pytest.mark.parametrize("trusted", [True, False])
-    @pytest.mark.anyio
-    async def test_cat_max_amount_send(self, self_hostname, two_wallet_nodes, trusted):
-        num_blocks = 3
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node, server_2 = wallets[0]
-        wallet_node_2, server_3 = wallets[1]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
-        if trusted:
-            wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-            wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        else:
-            wallet_node.config["trusted_peers"] = {}
-            wallet_node_2.config["trusted_peers"] = {}
-        await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"0"))
-        funds = sum(
-            [
-                calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i))
-                for i in range(1, num_blocks + 1)
-            ]
+    await full_node_api.process_transaction_records(records=[*tx_records, *tx_records_2])
+    await time_out_assert(20, cat_wallet_0.get_confirmed_balance, 55)
+    await time_out_assert(20, cat_wallet_0.get_unconfirmed_balance, 55)
+    await time_out_assert(30, cat_wallet_1.get_confirmed_balance, 45)
+    await time_out_assert(30, cat_wallet_1.get_unconfirmed_balance, 45)
+    await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 0)
+    await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 0)
+    txs = await wallet_1.wallet_state_manager.tx_store.get_transactions_between(cat_wallet_1.id(), 0, 100000)
+    # Test with Memo
+    tx_records_3 = await cat_wallet_1.generate_signed_transaction(
+        [uint64(30)], [cat_hash], DEFAULT_TX_CONFIG, memos=[[b"Markus Walburg"]]
+    )
+    with pytest.raises(ValueError):
+        await cat_wallet_1.generate_signed_transaction(
+            [uint64(30)], [cat_hash], DEFAULT_TX_CONFIG, memos=[[b"too"], [b"many"], [b"memos"]]
         )
-        await time_out_assert(20, wallet.get_confirmed_balance, funds)
+    await wallet_1.wallet_state_manager.add_pending_transactions(tx_records_3)
+    await time_out_assert(15, full_node_api.txs_in_mempool, True, tx_records_3)
+    txs = await wallet_1.wallet_state_manager.tx_store.get_transactions_between(cat_wallet_1.id(), 0, 100000)
+    for tx in txs:
+        if tx.amount == 30:
+            memos = tx.get_memos()
+            assert len(memos) == 2  # One for tx, one for change
+            assert b"Markus Walburg" in [v for v_list in memos.values() for v in v_list]
+            assert tx.spend_bundle is not None
+            assert list(memos.keys())[0] in [a.name() for a in tx.spend_bundle.additions()]
-        async with wallet_node.wallet_state_manager.lock:
-            cat_wallet, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                {"identifier": "genesis_by_id"},
-                uint64(100000),
-                DEFAULT_TX_CONFIG,
-            )
-        tx_records: List[TransactionRecord] = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
-        await full_node_api.process_transaction_records(records=tx_records)
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN, ConsensusMode.HARD_FORK_2_0], reason="save time")
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.anyio
+async def test_cat_max_amount_send(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
+    num_blocks = 3
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node, server_2 = wallets[0]
+    wallet_node_2, server_3 = wallets[1]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
+    if trusted:
+        wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+        wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    else:
+        wallet_node.config["trusted_peers"] = {}
+        wallet_node_2.config["trusted_peers"] = {}
+    await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for _ in range(num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"0")))
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 100000)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100000)
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks + 1)]
+    )
-        assert cat_wallet.cat_info.limitations_program_hash is not None
+    await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        cat_2 = await cat_wallet.get_new_inner_puzzle()
-        cat_2_hash = cat_2.get_tree_hash()
-        amounts = []
-        puzzle_hashes = []
-        for i in range(1, 50):
-            amounts.append(uint64(i))
-            puzzle_hashes.append(cat_2_hash)
-        spent_coint = (await cat_wallet.get_cat_spendable_coins())[0].coin
-        tx_records = await cat_wallet.generate_signed_transaction(
-            amounts, puzzle_hashes, DEFAULT_TX_CONFIG, coins={spent_coint}
-        )
-        await wallet.wallet_state_manager.add_pending_transactions(tx_records)
-        await full_node_api.process_transaction_records(records=tx_records)
-        await asyncio.sleep(2)
-        async def check_all_there():
-            spendable = await cat_wallet.get_cat_spendable_coins()
-            spendable_name_set = set()
-            for record in spendable:
-                spendable_name_set.add(record.coin.name())
-            puzzle_hash = construct_cat_puzzle(
-                CAT_MOD, cat_wallet.cat_info.limitations_program_hash, cat_2
-            ).get_tree_hash()
-            for i in range(1, 50):
-                coin = Coin(spent_coint.name(), puzzle_hash, i)
-                if coin.name() not in spendable_name_set:
-                    return False
-            return True
-        await time_out_assert(20, check_all_there, True)
-        await asyncio.sleep(5)
-        max_sent_amount = await cat_wallet.get_max_send_amount()
-        # 1) Generate transaction that is under the limit
-        [transaction_record] = await cat_wallet.generate_signed_transaction(
-            [max_sent_amount - 1],
-            [ph],
+    async with wallet_node.wallet_state_manager.lock:
+        cat_wallet, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            {"identifier": "genesis_by_id"},
+            uint64(100000),
             DEFAULT_TX_CONFIG,
         )
+    tx_records = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
+    await full_node_api.process_transaction_records(records=tx_records)
-        assert transaction_record.amount == uint64(max_sent_amount - 1)
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 100000)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100000)
-        # 2) Generate transaction that is equal to limit
-        [transaction_record] = await cat_wallet.generate_signed_transaction(
-            [max_sent_amount],
-            [ph],
-            DEFAULT_TX_CONFIG,
-        )
+    assert cat_wallet.cat_info.limitations_program_hash is not None
-        assert transaction_record.amount == uint64(max_sent_amount)
-        # 3) Generate transaction that is greater than limit
-        with pytest.raises(ValueError):
-            await cat_wallet.generate_signed_transaction(
-                [max_sent_amount + 1],
-                [ph],
-                DEFAULT_TX_CONFIG,
-            )
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN, ConsensusMode.HARD_FORK_2_0], reason="save time")
-    @pytest.mark.parametrize("trusted", [True, False])
-    @pytest.mark.parametrize("autodiscovery", [True, False])
-    @pytest.mark.anyio
-    async def test_cat_hint(self, self_hostname, two_wallet_nodes, trusted, autodiscovery):
-        num_blocks = 3
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.server
-        wallet_node, server_2 = wallets[0]
-        wallet_node_2, server_3 = wallets[1]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        wallet2 = wallet_node_2.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
-        if trusted:
-            wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-            wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        else:
-            wallet_node.config["trusted_peers"] = {}
-            wallet_node_2.config["trusted_peers"] = {}
-        wallet_node.config["automatically_add_unknown_cats"] = autodiscovery
-        wallet_node_2.config["automatically_add_unknown_cats"] = autodiscovery
-        await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(32 * b"0"))
-        funds = sum(
-            [
-                calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i))
-                for i in range(1, num_blocks + 1)
-            ]
-        )
+    cat_2 = await cat_wallet.get_new_inner_puzzle()
+    cat_2_hash = cat_2.get_tree_hash()
+    amounts = []
+    puzzle_hashes = []
+    for i in range(1, 50):
+        amounts.append(uint64(i))
+        puzzle_hashes.append(cat_2_hash)
+    spent_coint = (await cat_wallet.get_cat_spendable_coins())[0].coin
+    tx_records = await cat_wallet.generate_signed_transaction(
+        amounts, puzzle_hashes, DEFAULT_TX_CONFIG, coins={spent_coint}
+    )
+    await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    await full_node_api.process_transaction_records(records=tx_records)
-        await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        async with wallet_node.wallet_state_manager.lock:
-            cat_wallet, _ = await CATWallet.create_new_cat_wallet(
-                wallet_node.wallet_state_manager,
-                wallet,
-                {"identifier": "genesis_by_id"},
-                uint64(100),
-                DEFAULT_TX_CONFIG,
-            )
-        tx_records: List[TransactionRecord] = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
-        await full_node_api.process_transaction_records(records=tx_records)
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
-        assert cat_wallet.cat_info.limitations_program_hash is not None
-        cat_2_hash = await wallet2.get_new_puzzlehash()
-        tx_records = await cat_wallet.generate_signed_transaction(
-            [uint64(60)], [cat_2_hash], DEFAULT_TX_CONFIG, memos=[[cat_2_hash]]
-        )
+    await asyncio.sleep(2)
+    async def check_all_there() -> bool:
+        spendable = await cat_wallet.get_cat_spendable_coins()
+        spendable_name_set = set()
+        for record in spendable:
+            spendable_name_set.add(record.coin.name())
+        puzzle_hash = construct_cat_puzzle(CAT_MOD, cat_wallet.cat_info.limitations_program_hash, cat_2).get_tree_hash()
+        for i in range(1, 50):
+            coin = Coin(spent_coint.name(), puzzle_hash, i)
+            if coin.name() not in spendable_name_set:
+                return False
+        return True
+    await time_out_assert(20, check_all_there, True)
+    await asyncio.sleep(5)
+    max_sent_amount = await cat_wallet.get_max_send_amount()
+    # 1) Generate transaction that is under the limit
+    [transaction_record] = await cat_wallet.generate_signed_transaction(
+        [uint64(max_sent_amount - 1)], [ph], DEFAULT_TX_CONFIG
+    )
+    assert transaction_record.amount == uint64(max_sent_amount - 1)
-        await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    # 2) Generate transaction that is equal to limit
+    [transaction_record] = await cat_wallet.generate_signed_transaction(
+        [uint64(max_sent_amount)], [ph], DEFAULT_TX_CONFIG
+    )
+    assert transaction_record.amount == uint64(max_sent_amount)
+    # 3) Generate transaction that is greater than limit
+    with pytest.raises(ValueError):
+        await cat_wallet.generate_signed_transaction([uint64(max_sent_amount + 1)], [ph], DEFAULT_TX_CONFIG)
-        await full_node_api.process_transaction_records(records=tx_records)
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 40)
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN, ConsensusMode.HARD_FORK_2_0], reason="save time")
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.parametrize("autodiscovery", [True, False])
+@pytest.mark.anyio
+async def test_cat_hint(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool, autodiscovery: bool
+) -> None:
+    num_blocks = 3
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node, server_2 = wallets[0]
+    wallet_node_2, server_3 = wallets[1]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    wallet2 = wallet_node_2.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
+    if trusted:
+        wallet_node.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+        wallet_node_2.config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    else:
+        wallet_node.config["trusted_peers"] = {}
+        wallet_node_2.config["trusted_peers"] = {}
+    wallet_node.config["automatically_add_unknown_cats"] = autodiscovery
+    wallet_node_2.config["automatically_add_unknown_cats"] = autodiscovery
+    await server_2.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await server_3.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for _ in range(num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32(32 * b"0")))
-        if autodiscovery:
-            # Autodiscovery enabled: test that wallet was created at this point
-            await time_out_assert(20, check_wallets, 2, wallet_node_2)
-        else:
-            # Autodiscovery disabled: test that no wallet was created
-            await time_out_assert(20, check_wallets, 1, wallet_node_2)
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks + 1)]
+    )
-        # Then we update the wallet's default CATs
-        wallet_node_2.wallet_state_manager.default_cats = {
-            cat_wallet.cat_info.limitations_program_hash.hex(): {
-                "asset_id": cat_wallet.cat_info.limitations_program_hash.hex(),
-                "name": "Test",
-                "symbol": "TST",
-            }
-        }
+    await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        # Then we send another transaction
-        tx_records = await cat_wallet.generate_signed_transaction(
-            [uint64(10)], [cat_2_hash], DEFAULT_TX_CONFIG, memos=[[cat_2_hash]]
+    async with wallet_node.wallet_state_manager.lock:
+        cat_wallet, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node.wallet_state_manager,
+            wallet,
+            {"identifier": "genesis_by_id"},
+            uint64(100),
+            DEFAULT_TX_CONFIG,
         )
+    tx_records = await wallet_node.wallet_state_manager.tx_store.get_not_sent()
+    await full_node_api.process_transaction_records(records=tx_records)
-        await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 100)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 100)
+    assert cat_wallet.cat_info.limitations_program_hash is not None
-        await full_node_api.process_transaction_records(records=tx_records)
+    cat_2_hash = await wallet2.get_new_puzzlehash()
+    tx_records = await cat_wallet.generate_signed_transaction(
+        [uint64(60)], [cat_2_hash], DEFAULT_TX_CONFIG, memos=[[cat_2_hash]]
+    )
+    await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    await full_node_api.process_transaction_records(records=tx_records)
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 30)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 30)
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 40)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 40)
-        # Now we check that another wallet WAS created, even if autodiscovery was disabled
+    if autodiscovery:
+        # Autodiscovery enabled: test that wallet was created at this point
         await time_out_assert(20, check_wallets, 2, wallet_node_2)
-        cat_wallet_2 = wallet_node_2.wallet_state_manager.wallets[2]
+    else:
+        # Autodiscovery disabled: test that no wallet was created
+        await time_out_assert(20, check_wallets, 1, wallet_node_2)
+    # Then we update the wallet's default CATs
+    wallet_node_2.wallet_state_manager.default_cats = {
+        cat_wallet.cat_info.limitations_program_hash.hex(): {
+            "asset_id": cat_wallet.cat_info.limitations_program_hash.hex(),
+            "name": "Test",
+            "symbol": "TST",
+        }
+    }
+    # Then we send another transaction
+    tx_records = await cat_wallet.generate_signed_transaction(
+        [uint64(10)], [cat_2_hash], DEFAULT_TX_CONFIG, memos=[[cat_2_hash]]
+    )
+    await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    await full_node_api.process_transaction_records(records=tx_records)
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 30)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 30)
-        # Previous balance + balance that triggered creation in case of disabled autodiscovery
-        await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 70)
-        await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 70)
+    # Now we check that another wallet WAS created, even if autodiscovery was disabled
+    await time_out_assert(20, check_wallets, 2, wallet_node_2)
+    cat_wallet_2 = wallet_node_2.wallet_state_manager.wallets[uint32(2)]
+    assert isinstance(cat_wallet_2, CATWallet)
-        cat_hash = await cat_wallet.get_new_inner_hash()
-        tx_records = await cat_wallet_2.generate_signed_transaction([uint64(5)], [cat_hash], DEFAULT_TX_CONFIG)
-        await wallet.wallet_state_manager.add_pending_transactions(tx_records)
+    # Previous balance + balance that triggered creation in case of disabled autodiscovery
+    await time_out_assert(30, cat_wallet_2.get_confirmed_balance, 70)
+    await time_out_assert(30, cat_wallet_2.get_unconfirmed_balance, 70)
-        await full_node_api.process_transaction_records(records=tx_records)
+    cat_hash = await cat_wallet.get_new_inner_hash()
+    tx_records = await cat_wallet_2.generate_signed_transaction([uint64(5)], [cat_hash], DEFAULT_TX_CONFIG)
+    await wallet.wallet_state_manager.add_pending_transactions(tx_records)
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, 35)
-        await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 35)
+    await full_node_api.process_transaction_records(records=tx_records)
-    @pytest.mark.parametrize(
-        "trusted",
-        [True, False],
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, 35)
+    await time_out_assert(20, cat_wallet.get_unconfirmed_balance, 35)
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.anyio
+async def test_cat_change_detection(
+    self_hostname: str, one_wallet_and_one_simulator_services: SimulatorsAndWalletsServices, trusted: bool
+) -> None:
+    num_blocks = 1
+    full_nodes, wallets, bt = one_wallet_and_one_simulator_services
+    full_node_api = full_nodes[0]._api
+    full_node_server = full_node_api.full_node.server
+    wallet_service_0 = wallets[0]
+    wallet_node_0 = wallet_service_0._node
+    wallet_0 = wallet_node_0.wallet_state_manager.main_wallet
+    assert wallet_service_0.rpc_server is not None
+    client_0 = await WalletRpcClient.create(
+        bt.config["self_hostname"],
+        wallet_service_0.rpc_server.listen_port,
+        wallet_service_0.root_path,
+        wallet_service_0.config,
     )
-    @pytest.mark.anyio
-    async def test_cat_change_detection(
-        self, self_hostname: str, one_wallet_and_one_simulator_services: SimulatorsAndWalletsServices, trusted: bool
-    ) -> None:
-        num_blocks = 1
-        full_nodes, wallets, bt = one_wallet_and_one_simulator_services
-        full_node_api: FullNodeSimulator = full_nodes[0]._api
-        full_node_server = full_node_api.full_node.server
-        wallet_service_0 = wallets[0]
-        wallet_node_0 = wallet_service_0._node
-        wallet_0 = wallet_node_0.wallet_state_manager.main_wallet
-        assert wallet_service_0.rpc_server is not None
-        client_0 = await WalletRpcClient.create(
-            bt.config["self_hostname"],
-            wallet_service_0.rpc_server.listen_port,
-            wallet_service_0.root_path,
-            wallet_service_0.config,
-        )
-        wallet_node_0.config["automatically_add_unknown_cats"] = True
-        if trusted:
-            wallet_node_0.config["trusted_peers"] = {
-                full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
-            }
-        else:
-            wallet_node_0.config["trusted_peers"] = {}
-        await wallet_node_0.server.start_client(PeerInfo(self_hostname, uint16(full_node_server.get_port())), None)
-        await full_node_api.farm_blocks_to_wallet(count=num_blocks, wallet=wallet_0)
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_0, timeout=20)
-        # Mint CAT to ourselves, immediately spend it to an unhinted puzzle hash that we have manually added to the DB
-        # We should pick up this coin as balance even though it is unhinted because it is "change"
-        intermediate_sk_un = master_sk_to_wallet_sk_unhardened_intermediate(
-            wallet_node_0.wallet_state_manager.private_key
-        )
-        pubkey_unhardened = _derive_path_unhardened(intermediate_sk_un, [100000000]).get_g1()
-        inner_puzhash = puzzle_hash_for_pk(pubkey_unhardened)
-        puzzlehash_unhardened = construct_cat_puzzle(
-            CAT_MOD, Program.to(None).get_tree_hash(), inner_puzhash
-        ).get_tree_hash_precalc(inner_puzhash)
-        change_derivation = DerivationRecord(
-            uint32(0),
-            puzzlehash_unhardened,
-            pubkey_unhardened,
-            WalletType.CAT,
-            uint32(2),
-            False,
-        )
-        # Insert the derivation record before the wallet exists so that it is not subscribed to
-        await wallet_node_0.wallet_state_manager.puzzle_store.add_derivation_paths([change_derivation])
-        our_puzzle: Program = await wallet_0.get_new_puzzle()
-        cat_puzzle: Program = construct_cat_puzzle(
-            CAT_MOD,
-            Program.to(None).get_tree_hash(),
-            Program.to(1),
-        )
-        addr = encode_puzzle_hash(cat_puzzle.get_tree_hash(), "txch")
-        cat_amount_0 = uint64(100)
-        cat_amount_1 = uint64(5)
-        tx = await client_0.send_transaction(1, cat_amount_0, addr, DEFAULT_TX_CONFIG)
-        spend_bundle = tx.spend_bundle
-        assert spend_bundle is not None
-        await time_out_assert_not_none(5, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
-        await full_node_api.farm_blocks_to_wallet(count=num_blocks, wallet=wallet_0)
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_0, timeout=20)
-        # Do the eve spend back to our wallet and add the CR layer
-        cat_coin = next(c for c in spend_bundle.additions() if c.amount == cat_amount_0)
-        next_coin = Coin(
-            cat_coin.name(),
-            construct_cat_puzzle(
-                CAT_MOD,
-                Program.to(None).get_tree_hash(),
-                our_puzzle,
-            ).get_tree_hash(),
-            cat_amount_0,
-        )
-        eve_spend = await wallet_node_0.wallet_state_manager.sign_transaction(
-            [
-                make_spend(
-                    cat_coin,
-                    cat_puzzle,
-                    Program.to(
+    wallet_node_0.config["automatically_add_unknown_cats"] = True
+    if trusted:
+        wallet_node_0.config["trusted_peers"] = {
+            full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
+        }
+    else:
+        wallet_node_0.config["trusted_peers"] = {}
+    await wallet_node_0.server.start_client(PeerInfo(self_hostname, uint16(full_node_server.get_port())), None)
+    await full_node_api.farm_blocks_to_wallet(count=num_blocks, wallet=wallet_0)
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_0, timeout=20)
+    # Mint CAT to ourselves, immediately spend it to an unhinted puzzle hash that we have manually added to the DB
+    # We should pick up this coin as balance even though it is unhinted because it is "change"
+    intermediate_sk_un = master_sk_to_wallet_sk_unhardened_intermediate(wallet_node_0.wallet_state_manager.private_key)
+    pubkey_unhardened = _derive_path_unhardened(intermediate_sk_un, [100000000]).get_g1()
+    inner_puzhash = puzzle_hash_for_pk(pubkey_unhardened)
+    puzzlehash_unhardened = construct_cat_puzzle(
+        CAT_MOD, Program.to(None).get_tree_hash(), inner_puzhash
+    ).get_tree_hash_precalc(inner_puzhash)
+    change_derivation = DerivationRecord(
+        uint32(0), puzzlehash_unhardened, pubkey_unhardened, WalletType.CAT, uint32(2), False
+    )
+    # Insert the derivation record before the wallet exists so that it is not subscribed to
+    await wallet_node_0.wallet_state_manager.puzzle_store.add_derivation_paths([change_derivation])
+    our_puzzle = await wallet_0.get_new_puzzle()
+    cat_puzzle = construct_cat_puzzle(
+        CAT_MOD,
+        Program.to(None).get_tree_hash(),
+        Program.to(1),
+    )
+    addr = encode_puzzle_hash(cat_puzzle.get_tree_hash(), "txch")
+    cat_amount_0 = uint64(100)
+    cat_amount_1 = uint64(5)
+    tx = await client_0.send_transaction(1, cat_amount_0, addr, DEFAULT_TX_CONFIG)
+    spend_bundle = tx.spend_bundle
+    assert spend_bundle is not None
+    await time_out_assert_not_none(5, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
+    await full_node_api.farm_blocks_to_wallet(count=num_blocks, wallet=wallet_0)
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_0, timeout=20)
+    # Do the eve spend back to our wallet and add the CR layer
+    cat_coin = next(c for c in spend_bundle.additions() if c.amount == cat_amount_0)
+    next_coin = Coin(
+        cat_coin.name(),
+        construct_cat_puzzle(CAT_MOD, Program.to(None).get_tree_hash(), our_puzzle).get_tree_hash(),
+        cat_amount_0,
+    )
+    eve_spend = await wallet_node_0.wallet_state_manager.sign_transaction(
+        [
+            make_spend(
+                cat_coin,
+                cat_puzzle,
+                Program.to(
+                    [
+                        Program.to(
+                            [
+                                [51, our_puzzle.get_tree_hash(), cat_amount_0, [our_puzzle.get_tree_hash()]],
+                                [51, None, -113, None, None],
+                            ]
+                        ),
+                        None,
+                        cat_coin.name(),
+                        coin_as_list(cat_coin),
+                        [cat_coin.parent_coin_info, Program.to(1).get_tree_hash(), cat_coin.amount],
+                        0,
+                        0,
+                    ]
+                ),
+            ),
+            make_spend(
+                next_coin,
+                construct_cat_puzzle(CAT_MOD, Program.to(None).get_tree_hash(), our_puzzle),
+                Program.to(
+                    [
                         [
-                            Program.to(
+                            None,
+                            (
+                                1,
                                 [
-                                    [
-                                        51,
-                                        our_puzzle.get_tree_hash(),
-                                        cat_amount_0,
-                                        [our_puzzle.get_tree_hash()],
-                                    ],
-                                    [51, None, -113, None, None],
-                                ]
+                                    [51, inner_puzhash, cat_amount_1],
+                                    [51, bytes32([0] * 32), cat_amount_0 - cat_amount_1],
+                                ],
                             ),
                             None,
-                            cat_coin.name(),
-                            coin_as_list(cat_coin),
-                            [cat_coin.parent_coin_info, Program.to(1).get_tree_hash(), cat_coin.amount],
-                            0,
-                            0,
-                        ]
-                    ),
+                        ],
+                        LineageProof(
+                            cat_coin.parent_coin_info, Program.to(1).get_tree_hash(), cat_amount_0
+                        ).to_program(),
+                        next_coin.name(),
+                        coin_as_list(next_coin),
+                        [next_coin.parent_coin_info, our_puzzle.get_tree_hash(), next_coin.amount],
+                        0,
+                        0,
+                    ]
                 ),
-                make_spend(
-                    next_coin,
-                    construct_cat_puzzle(
-                        CAT_MOD,
-                        Program.to(None).get_tree_hash(),
-                        our_puzzle,
-                    ),
-                    Program.to(
-                        [
-                            [
-                                None,
-                                (
-                                    1,
-                                    [
-                                        [51, inner_puzhash, cat_amount_1],
-                                        [51, bytes32([0] * 32), cat_amount_0 - cat_amount_1],
-                                    ],
-                                ),
-                                None,
-                            ],
-                            LineageProof(
-                                cat_coin.parent_coin_info, Program.to(1).get_tree_hash(), cat_amount_0
-                            ).to_program(),
-                            next_coin.name(),
-                            coin_as_list(next_coin),
-                            [next_coin.parent_coin_info, our_puzzle.get_tree_hash(), next_coin.amount],
-                            0,
-                            0,
-                        ]
-                    ),
-                ),
-            ],
-        )
-        await client_0.push_tx(eve_spend)
-        await time_out_assert_not_none(5, full_node_api.full_node.mempool_manager.get_spendbundle, eve_spend.name())
-        await full_node_api.farm_blocks_to_wallet(count=num_blocks, wallet=wallet_0)
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_0, timeout=20)
+            ),
+        ],
+    )
+    await client_0.push_tx(eve_spend)
+    await time_out_assert_not_none(5, full_node_api.full_node.mempool_manager.get_spendbundle, eve_spend.name())
+    await full_node_api.farm_blocks_to_wallet(count=num_blocks, wallet=wallet_0)
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_0, timeout=20)
-        await time_out_assert(20, check_wallets, 2, wallet_node_0)
-        cat_wallet = wallet_node_0.wallet_state_manager.wallets[uint32(2)]
-        await time_out_assert(20, cat_wallet.get_confirmed_balance, cat_amount_1)
-        assert not full_node_api.full_node.subscriptions.has_ph_subscription(puzzlehash_unhardened)
+    await time_out_assert(20, check_wallets, 2, wallet_node_0)
+    cat_wallet = wallet_node_0.wallet_state_manager.wallets[uint32(2)]
+    await time_out_assert(20, cat_wallet.get_confirmed_balance, cat_amount_1)
+    assert not full_node_api.full_node.subscriptions.has_puzzle_subscription(puzzlehash_unhardened)
 @pytest.mark.anyio
 async def test_unacknowledged_cat_table() -> None:
     db_name = Path(tempfile.TemporaryDirectory().name).joinpath("test.sqlite")
     db_name.parent.mkdir(parents=True, exist_ok=True)
-    async with DBWrapper2.managed(
-        database=db_name,
-    ) as db_wrapper:
+    async with DBWrapper2.managed(database=db_name) as db_wrapper:
         interested_store = await WalletInterestedStore.create(db_wrapper)
         def asset_id(i: int) -> bytes32:
         @@@ -1062,22 -1062,22 +999,10 @@@
         def coin_state(i: int) -> CoinState:
             return CoinState(Coin(bytes32([0] * 32), bytes32([0] * 32), uint64(i)), None, None)
-        await interested_store.add_unacknowledged_coin_state(
-            asset_id(0),
-            coin_state(0),
-            None,
-        )
-        await interested_store.add_unacknowledged_coin_state(
-            asset_id(1),
-            coin_state(1),
-            100,
-        )
+        await interested_store.add_unacknowledged_coin_state(asset_id(0), coin_state(0), None)
+        await interested_store.add_unacknowledged_coin_state(asset_id(1), coin_state(1), 100)
         assert await interested_store.get_unacknowledged_states_for_asset_id(asset_id(0)) == [(coin_state(0), 0)]
-        await interested_store.add_unacknowledged_coin_state(
-            asset_id(0),
-            coin_state(0),
-            None,
-        )
+        await interested_store.add_unacknowledged_coin_state(asset_id(0), coin_state(0), None)
         assert await interested_store.get_unacknowledged_states_for_asset_id(asset_id(0)) == [(coin_state(0), 0)]
         assert await interested_store.get_unacknowledged_states_for_asset_id(asset_id(1)) == [(coin_state(1), 100)]
         assert await interested_store.get_unacknowledged_states_for_asset_id(asset_id(2)) == []

tests/wallet/cat_wallet/test_offer_lifecycle.py CHANGED Viewed

         @@@ -1,17 -1,17 +1,17 @@@
 from __future__ import annotations
 from dataclasses import replace
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, cast
 import pytest
 from chia_rs import G2Element
-from chia.clvm.spend_sim import sim_and_client
+from chia.clvm.spend_sim import CostLogger, SimClient, SpendSim, sim_and_client
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.program import Program
 from chia.types.blockchain_format.serialized_program import SerializedProgram
 from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.types.coin_spend import CoinSpend, make_spend
+from chia.types.coin_spend import make_spend
 from chia.types.mempool_inclusion_status import MempoolInclusionStatus
 from chia.types.spend_bundle import SpendBundle
 from chia.util.ints import uint64
         @@@ -21,11 -21,11 +21,11 @@@ from chia.wallet.cat_wallet.cat_utils i
     construct_cat_puzzle,
     unsigned_spend_bundle_for_spendable_cats,
 )
-from chia.wallet.conditions import AssertCoinAnnouncement, ConditionValidTimes
+from chia.wallet.conditions import AssertPuzzleAnnouncement, ConditionValidTimes
 from chia.wallet.outer_puzzles import AssetType
 from chia.wallet.payment import Payment
 from chia.wallet.puzzle_drivers import PuzzleInfo
-from chia.wallet.trading.offer import OFFER_MOD, NotarizedPayment, Offer
+from chia.wallet.trading.offer import OFFER_MOD, Offer
 acs = Program.to(1)
 acs_ph = acs.get_tree_hash()
         @@@ -33,7 -33,7 +33,8 @@@
 # Some methods mapping strings to CATs
 def str_to_tail(tail_str: str) -> Program:
-    return Program.to([3, [], [1, tail_str], []])
+    # TODO: Remove cast when we improve typing
+    return cast(Program, Program.to([3, [], [1, tail_str], []]))
 def str_to_tail_hash(tail_str: str) -> bytes32:
         @@@ -46,24 -46,24 +47,22 @@@ def str_to_cat_hash(tail_str: str) -> b
 # This method takes a dictionary of strings mapping to amounts and generates the appropriate CAT/XCH coins
 async def generate_coins(
-    sim,
-    sim_client,
-    requested_coins: Dict[Optional[str], List[uint64]],
+    sim: SpendSim, sim_client: SimClient, requested_coins: Dict[Optional[str], List[int]]
 ) -> Dict[Optional[str], List[Coin]]:
     await sim.farm_block(acs_ph)
-    parent_coin: Coin = [cr.coin for cr in await sim_client.get_coin_records_by_puzzle_hash(acs_ph)][0]
+    parent_coin = [cr.coin for cr in await sim_client.get_coin_records_by_puzzle_hash(acs_ph)][0]
     # We need to gather a list of initial coins to create as well as spends that do the eve spend for every CAT
-    payments: List[Payment] = []
-    cat_bundles: List[SpendBundle] = []
+    payments = []
+    cat_bundles = []
     for tail_str, amounts in requested_coins.items():
         for amount in amounts:
             if tail_str:
-                tail: Program = str_to_tail(tail_str)  # Making a fake but unique TAIL
+                tail = str_to_tail(tail_str)  # Making a fake but unique TAIL
                 tail_hash = tail.get_tree_hash()
-                cat_puzzle: Program = construct_cat_puzzle(CAT_MOD, tail_hash, acs)
+                cat_puzzle = construct_cat_puzzle(CAT_MOD, tail_hash, acs)
                 cat_puzzle_hash = cat_puzzle.get_tree_hash()
-                payments.append(Payment(cat_puzzle_hash, amount))
+                payments.append(Payment(cat_puzzle_hash, uint64(amount)))
                 cat_bundles.append(
                     unsigned_spend_bundle_for_spendable_cats(
                         CAT_MOD,
         @@@ -78,18 -78,18 +77,11 @@@
                     )
                 )
             else:
-                payments.append(Payment(acs_ph, amount))
+                payments.append(Payment(acs_ph, uint64(amount)))
     # This bundle creates all of the initial coins
     parent_bundle = SpendBundle(
-        [
-            make_spend(
-                parent_coin,
-                acs,
-                Program.to([[51, p.puzzle_hash, p.amount] for p in payments]),
-            )
-        ],
-        G2Element(),
+        [make_spend(parent_coin, acs, Program.to([[51, p.puzzle_hash, p.amount] for p in payments]))], G2Element()
     )
     # Then we aggregate it with all of the eve spends
         @@@ -101,7 -101,7 +93,7 @@@
     for tail_str, _ in requested_coins.items():
         if tail_str:
             tail_hash = str_to_tail_hash(tail_str)
-            cat_ph: bytes32 = construct_cat_puzzle(CAT_MOD, tail_hash, acs).get_tree_hash()
+            cat_ph = construct_cat_puzzle(CAT_MOD, tail_hash, acs).get_tree_hash()
             coin_dict[tail_str] = [
                 cr.coin for cr in await sim_client.get_coin_records_by_puzzle_hash(cat_ph, include_spent_coins=False)
             ]
         @@@ -123,14 -123,14 +115,14 @@@
 # but doesn't bother with non-offer announcements
 def generate_secure_bundle(
     selected_coins: List[Coin],
-    announcements: List[AssertCoinAnnouncement],
+    announcements: List[AssertPuzzleAnnouncement],
     offered_amount: uint64,
     tail_str: Optional[str] = None,
 ) -> SpendBundle:
-    announcement_assertions: List[Program] = [a.to_program() for a in announcements]
-    selected_coin_amount: int = sum([c.amount for c in selected_coins])
-    non_primaries: List[Coin] = [] if len(selected_coins) < 2 else selected_coins[1:]
-    inner_solution: List[List] = [
+    announcement_assertions = [a.to_program() for a in announcements]
+    selected_coin_amount = sum([c.amount for c in selected_coins])
+    non_primaries = [] if len(selected_coins) < 2 else selected_coins[1:]
+    inner_solution: List[List[Any]] = [
         [51, Offer.ph(), offered_amount],  # Offered coin
         [51, acs_ph, uint64(selected_coin_amount - offered_amount)],  # Change
         *announcement_assertions,
         @@@ -149,7 -149,7 +141,7 @@@
             G2Element(),
         )
     else:
-        spendable_cats: List[SpendableCAT] = [
+        spendable_cats = [
             SpendableCAT(
                 c,
                 str_to_tail_hash(tail_str),
         @@@ -168,180 -168,180 +160,135 @@@
     return bundle
-class TestOfferLifecycle:
-    @pytest.mark.anyio()
-    async def test_complex_offer(self, cost_logger):
-        async with sim_and_client() as (sim, sim_client):
-            coins_needed: Dict[Optional[str], List[int]] = {
-                None: [500, 400, 300],
-                "red": [250, 100],
-                "blue": [3000],
-            }
-            all_coins: Dict[Optional[str], List[Coin]] = await generate_coins(sim, sim_client, coins_needed)
-            chia_coins: List[Coin] = all_coins[None]
-            red_coins: List[Coin] = all_coins["red"]
-            blue_coins: List[Coin] = all_coins["blue"]
-            driver_dict: Dict[bytes32, PuzzleInfo] = {
-                str_to_tail_hash("red"): PuzzleInfo(
-                    {"type": AssetType.CAT.value, "tail": "0x" + str_to_tail_hash("red").hex()}
-                ),
-                str_to_tail_hash("blue"): PuzzleInfo(
-                    {"type": AssetType.CAT.value, "tail": "0x" + str_to_tail_hash("blue").hex()}
-                ),
-            }
-            driver_dict_as_infos: Dict[str, Any] = {}
-            for key, value in driver_dict.items():
-                driver_dict_as_infos[key.hex()] = value.info
-            # Create an XCH Offer for RED
-            chia_requested_payments: Dict[Optional[bytes32], List[Payment]] = {
-                str_to_tail_hash("red"): [
-                    Payment(acs_ph, 100, [b"memo"]),
-                    Payment(acs_ph, 200, [b"memo"]),
-                ]
-            }
-            chia_requested_payments: Dict[Optional[bytes32], List[NotarizedPayment]] = Offer.notarize_payments(
-                chia_requested_payments, chia_coins
-            )
-            chia_announcements: List[AssertCoinAnnouncement] = Offer.calculate_announcements(
-                chia_requested_payments, driver_dict
-            )
-            chia_secured_bundle: SpendBundle = generate_secure_bundle(chia_coins, chia_announcements, 1000)
-            chia_offer = Offer(chia_requested_payments, chia_secured_bundle, driver_dict)
-            assert not chia_offer.is_valid()
-            # Create a RED Offer for XCH
-            red_coins_1 = red_coins[0:1]
-            red_coins_2 = red_coins[1:]
-            red_requested_payments: Dict[Optional[bytes32], List[Payment]] = {
-                None: [
-                    Payment(acs_ph, 300, [b"red memo"]),
-                    Payment(acs_ph, 350, [b"red memo"]),
-                ]
-            }
-            red_requested_payments: Dict[Optional[bytes32], List[NotarizedPayment]] = Offer.notarize_payments(
-                red_requested_payments, red_coins_1
-            )
-            red_announcements: List[AssertCoinAnnouncement] = Offer.calculate_announcements(
-                red_requested_payments, driver_dict
-            )
-            red_secured_bundle: SpendBundle = generate_secure_bundle(
-                red_coins_1, red_announcements, sum([c.amount for c in red_coins_1]), tail_str="red"
-            )
-            red_offer = Offer(red_requested_payments, red_secured_bundle, driver_dict)
-            assert not red_offer.is_valid()
-            red_requested_payments_2: Dict[Optional[bytes32], List[Payment]] = {
-                None: [
-                    Payment(acs_ph, 50, [b"red memo"]),
-                ]
-            }
-            red_requested_payments_2: Dict[Optional[bytes32], List[NotarizedPayment]] = Offer.notarize_payments(
-                red_requested_payments_2, red_coins_2
-            )
-            red_announcements_2: List[AssertCoinAnnouncement] = Offer.calculate_announcements(
-                red_requested_payments_2, driver_dict
-            )
-            red_secured_bundle_2: SpendBundle = generate_secure_bundle(
-                red_coins_2, red_announcements_2, sum([c.amount for c in red_coins_2]), tail_str="red"
-            )
-            red_offer_2 = Offer(red_requested_payments_2, red_secured_bundle_2, driver_dict)
-            assert not red_offer_2.is_valid()
-            # Test aggregation of offers
-            new_offer = Offer.aggregate([chia_offer, red_offer, red_offer_2])
-            assert new_offer.get_offered_amounts() == {None: 1000, str_to_tail_hash("red"): 350}
-            assert new_offer.get_requested_amounts() == {None: 700, str_to_tail_hash("red"): 300}
-            assert new_offer.is_valid()
-            # Create yet another offer of BLUE for XCH and RED
-            blue_requested_payments: Dict[Optional[bytes32], List[Payment]] = {
-                None: [
-                    Payment(acs_ph, 200, [b"blue memo"]),
-                ],
-                str_to_tail_hash("red"): [
-                    Payment(acs_ph, 50, [b"blue memo"]),
-                ],
-            }
-            blue_requested_payments: Dict[Optional[bytes32], List[NotarizedPayment]] = Offer.notarize_payments(
-                blue_requested_payments, blue_coins
-            )
-            blue_announcements: List[AssertCoinAnnouncement] = Offer.calculate_announcements(
-                blue_requested_payments, driver_dict
-            )
-            blue_secured_bundle: SpendBundle = generate_secure_bundle(
-                blue_coins, blue_announcements, 2000, tail_str="blue"
-            )
-            blue_offer = Offer(blue_requested_payments, blue_secured_bundle, driver_dict)
-            assert not blue_offer.is_valid()
-            # Test a re-aggregation
-            new_offer: Offer = Offer.aggregate([new_offer, blue_offer])
-            assert new_offer.get_offered_amounts() == {
-                None: 1000,
-                str_to_tail_hash("red"): 350,
-                str_to_tail_hash("blue"): 2000,
-            }
-            assert new_offer.get_requested_amounts() == {None: 900, str_to_tail_hash("red"): 350}
-            assert new_offer.summary() == (
-                {
-                    "xch": 1000,
-                    str_to_tail_hash("red").hex(): 350,
-                    str_to_tail_hash("blue").hex(): 2000,
-                },
-                {"xch": 900, str_to_tail_hash("red").hex(): 350},
-                driver_dict_as_infos,
-                ConditionValidTimes(),
-            )
-            assert new_offer.get_pending_amounts() == {
-                "xch": 1200,
-                str_to_tail_hash("red").hex(): 350,
-                str_to_tail_hash("blue").hex(): 3000,
-            }
-            assert new_offer.is_valid()
-            # Test preventing TAIL from running during exchange
-            blue_cat_puz: Program = construct_cat_puzzle(CAT_MOD, str_to_tail_hash("blue"), OFFER_MOD)
-            blue_spend: CoinSpend = make_spend(
-                Coin(bytes32(32), blue_cat_puz.get_tree_hash(), uint64(0)),
-                blue_cat_puz,
-                Program.to([[bytes32(32), [bytes32(32), 200, ["hey there"]]]]),
-            )
-            new_spends_list: List[CoinSpend] = [blue_spend, *new_offer.to_spend_bundle().coin_spends]
-            tail_offer: Offer = Offer.from_spend_bundle(SpendBundle(new_spends_list, G2Element()))
-            valid_spend = tail_offer.to_valid_spend(bytes32(32))
-            real_blue_spend = [spend for spend in valid_spend.coin_spends if b"hey there" in bytes(spend)][0]
-            real_blue_spend_replaced = replace(
-                real_blue_spend,
-                solution=SerializedProgram.from_program(
-                    real_blue_spend.solution.to_program().replace(
-                        ffrfrf=Program.to(-113), ffrfrr=Program.to([str_to_tail("blue"), []])
-                    )
-                ),
-            )
-            valid_spend = SpendBundle(
-                [real_blue_spend_replaced, *[spend for spend in valid_spend.coin_spends if spend != real_blue_spend]],
-                G2Element(),
-            )
-            with pytest.raises(ValueError, match="clvm raise"):
-                valid_spend.additions()
+@pytest.mark.anyio()
+async def test_complex_offer(cost_logger: CostLogger) -> None:
+    async with sim_and_client() as (sim, sim_client):
+        coins_needed = {None: [500, 400, 300], "red": [250, 100], "blue": [3000]}
+        all_coins = await generate_coins(sim, sim_client, coins_needed)
+        chia_coins = all_coins[None]
+        red_coins = all_coins["red"]
+        blue_coins = all_coins["blue"]
+        driver_dict = {
+            str_to_tail_hash("red"): PuzzleInfo(
+                {"type": AssetType.CAT.value, "tail": "0x" + str_to_tail_hash("red").hex()}
+            ),
+            str_to_tail_hash("blue"): PuzzleInfo(
+                {"type": AssetType.CAT.value, "tail": "0x" + str_to_tail_hash("blue").hex()}
+            ),
+        }
+        driver_dict_as_infos = {key.hex(): value.info for key, value in driver_dict.items()}
+        # Create an XCH Offer for RED
+        chia_requested_payments: Dict[Optional[bytes32], List[Payment]] = {
+            str_to_tail_hash("red"): [Payment(acs_ph, uint64(100), [b"memo"]), Payment(acs_ph, uint64(200), [b"memo"])]
+        }
+        chia_notarized_payments = Offer.notarize_payments(chia_requested_payments, chia_coins)
+        chia_announcements = Offer.calculate_announcements(chia_notarized_payments, driver_dict)
+        chia_secured_bundle = generate_secure_bundle(chia_coins, chia_announcements, uint64(1000))
+        chia_offer = Offer(chia_notarized_payments, chia_secured_bundle, driver_dict)
+        assert not chia_offer.is_valid()
+        # Create a RED Offer for XCH
+        red_coins_1 = red_coins[0:1]
+        red_coins_2 = red_coins[1:]
+        red_requested_payments: Dict[Optional[bytes32], List[Payment]] = {
+            None: [Payment(acs_ph, uint64(300), [b"red memo"]), Payment(acs_ph, uint64(350), [b"red memo"])]
+        }
+        red_notarized_payments = Offer.notarize_payments(red_requested_payments, red_coins_1)
+        red_announcements = Offer.calculate_announcements(red_notarized_payments, driver_dict)
+        red_secured_bundle = generate_secure_bundle(
+            red_coins_1, red_announcements, uint64(sum([c.amount for c in red_coins_1])), tail_str="red"
+        )
+        red_offer = Offer(red_notarized_payments, red_secured_bundle, driver_dict)
+        assert not red_offer.is_valid()
+        red_requested_payments_2: Dict[Optional[bytes32], List[Payment]] = {
+            None: [Payment(acs_ph, uint64(50), [b"red memo"])]
+        }
+        red_notarized_payments_2 = Offer.notarize_payments(red_requested_payments_2, red_coins_2)
+        red_announcements_2 = Offer.calculate_announcements(red_notarized_payments_2, driver_dict)
+        red_secured_bundle_2 = generate_secure_bundle(
+            red_coins_2, red_announcements_2, uint64(sum([c.amount for c in red_coins_2])), tail_str="red"
+        )
+        red_offer_2 = Offer(red_notarized_payments_2, red_secured_bundle_2, driver_dict)
+        assert not red_offer_2.is_valid()
+        # Test aggregation of offers
+        new_offer = Offer.aggregate([chia_offer, red_offer, red_offer_2])
+        assert new_offer.get_offered_amounts() == {None: 1000, str_to_tail_hash("red"): 350}
+        assert new_offer.get_requested_amounts() == {None: 700, str_to_tail_hash("red"): 300}
+        assert new_offer.is_valid()
+        # Create yet another offer of BLUE for XCH and RED
+        blue_requested_payments: Dict[Optional[bytes32], List[Payment]] = {
+            None: [Payment(acs_ph, uint64(200), [b"blue memo"])],
+            str_to_tail_hash("red"): [Payment(acs_ph, uint64(50), [b"blue memo"])],
+        }
+        blue_notarized_payments = Offer.notarize_payments(blue_requested_payments, blue_coins)
+        blue_announcements = Offer.calculate_announcements(blue_notarized_payments, driver_dict)
+        blue_secured_bundle = generate_secure_bundle(blue_coins, blue_announcements, uint64(2000), tail_str="blue")
+        blue_offer = Offer(blue_notarized_payments, blue_secured_bundle, driver_dict)
+        assert not blue_offer.is_valid()
+        # Test a re-aggregation
+        new_offer = Offer.aggregate([new_offer, blue_offer])
+        assert new_offer.get_offered_amounts() == {
+            None: 1000,
+            str_to_tail_hash("red"): 350,
+            str_to_tail_hash("blue"): 2000,
+        }
+        assert new_offer.get_requested_amounts() == {None: 900, str_to_tail_hash("red"): 350}
+        assert new_offer.summary() == (
+            {"xch": 1000, str_to_tail_hash("red").hex(): 350, str_to_tail_hash("blue").hex(): 2000},
+            {"xch": 900, str_to_tail_hash("red").hex(): 350},
+            driver_dict_as_infos,
+            ConditionValidTimes(),
+        )
+        assert new_offer.get_pending_amounts() == {
+            "xch": 1200,
+            str_to_tail_hash("red").hex(): 350,
+            str_to_tail_hash("blue").hex(): 3000,
+        }
+        assert new_offer.is_valid()
+        # Test preventing TAIL from running during exchange
+        blue_cat_puz = construct_cat_puzzle(CAT_MOD, str_to_tail_hash("blue"), OFFER_MOD)
+        random_hash = bytes32([0] * 32)
+        blue_spend = make_spend(
+            Coin(random_hash, blue_cat_puz.get_tree_hash(), uint64(0)),
+            blue_cat_puz,
+            Program.to([[random_hash, [random_hash, 200, ["hey there"]]]]),
+        )
+        new_spends_list = [blue_spend, *new_offer.to_spend_bundle().coin_spends]
+        tail_offer = Offer.from_spend_bundle(SpendBundle(new_spends_list, G2Element()))
+        valid_spend = tail_offer.to_valid_spend(random_hash)
+        real_blue_spend = [spend for spend in valid_spend.coin_spends if b"hey there" in bytes(spend)][0]
+        real_blue_spend_replaced = replace(
+            real_blue_spend,
+            solution=SerializedProgram.from_program(
+                real_blue_spend.solution.to_program().replace(
+                    ffrfrf=Program.to(-113), ffrfrr=Program.to([str_to_tail("blue"), []])
+                )
+            ),
+        )
+        valid_spend = SpendBundle(
+            [real_blue_spend_replaced, *[spend for spend in valid_spend.coin_spends if spend != real_blue_spend]],
+            G2Element(),
+        )
+        with pytest.raises(ValueError, match="clvm raise"):
+            valid_spend.additions()
-            # Test (de)serialization
-            assert Offer.from_bytes(bytes(new_offer)) == new_offer
+        # Test (de)serialization
+        assert Offer.from_bytes(bytes(new_offer)) == new_offer
-            # Test compression
-            assert Offer.from_compressed(new_offer.compress()) == new_offer
+        # Test compression
+        assert Offer.from_compressed(new_offer.compress()) == new_offer
-            # Make sure we can actually spend the offer once it's valid
-            arbitrage_ph: bytes32 = Program.to([3, [], [], 1]).get_tree_hash()
-            offer_bundle: SpendBundle = new_offer.to_valid_spend(arbitrage_ph)
+        # Make sure we can actually spend the offer once it's valid
+        arbitrage_ph = Program.to([3, [], [], 1]).get_tree_hash()
+        offer_bundle = new_offer.to_valid_spend(arbitrage_ph)
-            result = await sim_client.push_tx(cost_logger.add_cost("Complex Offer", offer_bundle))
-            assert result == (MempoolInclusionStatus.SUCCESS, None)
-            await sim.farm_block()
+        result = await sim_client.push_tx(cost_logger.add_cost("Complex Offer", offer_bundle))
+        assert result == (MempoolInclusionStatus.SUCCESS, None)
+        await sim.farm_block()

tests/wallet/cat_wallet/test_trades.py CHANGED Viewed

         @@@ -1814,7 -1814,7 +1814,7 @@@ class TestCATTrades
             return wallet_node_taker._tx_messages_in_progress == {}
         for _ in range(10):
-            print(await wallet_node_taker._resend_queue())
+            await wallet_node_taker._resend_queue()
             await time_out_assert(5, check_wallet_cache_empty, True)
         offer_tx_records: List[TransactionRecord] = await wallet_node_maker.wallet_state_manager.tx_store.get_not_sent()
         await full_node.process_transaction_records(records=offer_tx_records)

tests/wallet/dao_wallet/test_dao_clvm.py CHANGED Viewed

         @@@ -224,7 -224,7 +224,7 @@@ def test_proposal() -> None
     with pytest.raises(ValueError) as e_info:
         conditions_dict_for_solution(full_proposal, repeat_solution_2, INFINITE_COST)
-    assert e_info.value.args[0] == "clvm raise"
+    assert "clvm raise" in e_info.value.args[0]
     # Test Launch
     current_yes_votes = 0
         @@@ -937,7 -937,7 +937,7 @@@ def test_lockup() -> None
     )
     with pytest.raises(ValueError) as e_info:
         conds = full_lockup_puz.run(revote_solution)
-    assert e_info.value.args[0] == "clvm raise"
+    assert "clvm raise" in e_info.value.args[0]
     # Test vote removal
     solution = Program.to(

tests/wallet/did_wallet/test_did.py CHANGED Viewed

         @@@ -23,6 -23,6 +23,8 @@@ from chia.wallet.singleton import creat
 from chia.wallet.util.address_type import AddressType
 from chia.wallet.util.tx_config import DEFAULT_COIN_SELECTION_CONFIG, DEFAULT_TX_CONFIG
 from chia.wallet.util.wallet_types import WalletType
+from chia.wallet.wallet_state_manager import WalletStateManager
+from tests.environments.wallet import WalletStateTransition, WalletTestFramework
 from tests.util.setup_nodes import OldSimulatorsAndWallets
 from tests.util.time_out_assert import time_out_assert, time_out_assert_not_none
         @@@ -109,9 -109,9 +111,7 @@@ class TestDIDWallet
         #######################
         all_node_0_wallets = await wallet_node_0.wallet_state_manager.user_store.get_all_wallet_info_entries()
-        print(f"Node 0: {all_node_0_wallets}")
         all_node_1_wallets = await wallet_node_1.wallet_state_manager.user_store.get_all_wallet_info_entries()
-        print(f"Node 1: {all_node_1_wallets}")
         assert (
             json.loads(all_node_0_wallets[1].data)["current_inner"]
             == json.loads(all_node_1_wallets[1].data)["current_inner"]
         @@@ -1268,9 -1268,9 +1268,7 @@@
         #######################
         all_node_0_wallets = await wallet_node_0.wallet_state_manager.user_store.get_all_wallet_info_entries()
-        print(f"Node 0: {all_node_0_wallets}")
         all_node_1_wallets = await wallet_node_1.wallet_state_manager.user_store.get_all_wallet_info_entries()
-        print(f"Node 1: {all_node_1_wallets}")
         assert len(all_node_0_wallets) == len(all_node_1_wallets)
         # Note that the inner program we expect is different than the on-chain inner.
         @@@ -1369,3 -1369,3 +1367,68 @@@
         await time_out_assert(30, get_wallet_num, 2, wallet_node_2.wallet_state_manager)
         did_wallet_2 = wallet_node_2.wallet_state_manager.get_wallet(uint32(2), DIDWallet)
         assert did_info == did_wallet_2.did_info
+@pytest.mark.parametrize(
+    "wallet_environments",
+    [
+        {
+            "num_environments": 1,
+            "blocks_needed": [1],
+        }
+    ],
+    indirect=True,
+)
+@pytest.mark.anyio
+async def test_did_coin_records(wallet_environments: WalletTestFramework, monkeypatch: pytest.MonkeyPatch) -> None:
+    # Setup
+    wallet_node = wallet_environments.environments[0].node
+    wallet = wallet_environments.environments[0].xch_wallet
+    client = wallet_environments.environments[0].rpc_client
+    # Generate DID wallet
+    did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(wallet_node.wallet_state_manager, wallet, uint64(1))
+    await wallet_environments.process_pending_states(
+        [
+            WalletStateTransition(
+                pre_block_balance_updates={
+                    1: {"set_remainder": True},
+                    2: {"init": True, "set_remainder": True},
+                },
+                post_block_balance_updates={
+                    1: {"set_remainder": True},
+                    2: {"set_remainder": True},
+                },
+            ),
+            WalletStateTransition(),
+        ]
+    )
+    # When transfer_did doesn't push the transactions automatically, this monkeypatching is no longer necessary
+    with monkeypatch.context() as m:
+        async def nothing(*args) -> None:
+            pass
+        m.setattr(WalletStateManager, "add_pending_transactions", nothing)
+        for _ in range(0, 2):
+            [tx] = await did_wallet.transfer_did(
+                await wallet.get_puzzle_hash(new=False), uint64(0), True, wallet_environments.tx_config
+            )
+            assert tx.spend_bundle is not None
+            await client.push_tx(tx.spend_bundle)
+            await wallet_environments.process_pending_states(
+                [
+                    WalletStateTransition(
+                        pre_block_balance_updates={},
+                        post_block_balance_updates={
+                            1: {"set_remainder": True},
+                            2: {"set_remainder": True},
+                        },
+                    ),
+                    WalletStateTransition(),
+                ]
+            )
+    assert len(await wallet.wallet_state_manager.get_spendable_coins_for_wallet(did_wallet.id())) == 1

tests/wallet/nft_wallet/test_nft_bulk_mint.py CHANGED Viewed

         @@@ -233,6 -233,6 +233,8 @@@ async def test_nft_mint_from_did_rpc
     hex_did_id = did_wallet_maker.get_my_DID()
     hmr_did_id = encode_puzzle_hash(bytes32.from_hexstr(hex_did_id), AddressType.DID.hrp(config))
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_maker, timeout=20)
     nft_wallet_maker = await api_maker.create_new_wallet(
         dict(wallet_type="nft_wallet", name="NFT WALLET 1", did_id=hmr_did_id)
     )
         @@@ -427,6 -427,6 +429,8 @@@ async def test_nft_mint_from_did_rpc_no
     hex_did_id = did_wallet_maker.get_my_DID()
     hmr_did_id = encode_puzzle_hash(bytes32.from_hexstr(hex_did_id), AddressType.DID.hrp(config))
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_maker, timeout=20)
     nft_wallet_maker = await api_maker.create_new_wallet(
         dict(wallet_type="nft_wallet", name="NFT WALLET 1", did_id=hmr_did_id)
     )
         @@@ -832,6 -832,6 +836,8 @@@ async def test_nft_mint_from_xch_rpc
     hex_did_id = did_wallet_maker.get_my_DID()
     hmr_did_id = encode_puzzle_hash(bytes32.from_hexstr(hex_did_id), AddressType.DID.hrp(config))
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_maker, timeout=20)
     nft_wallet_maker = await api_maker.create_new_wallet(
         dict(wallet_type="nft_wallet", name="NFT WALLET 1", did_id=hmr_did_id)
     )

tests/wallet/nft_wallet/test_nft_offers.py CHANGED Viewed

         @@@ -905,3 -905,3 +905,276 @@@ async def test_nft_offer_nft_for_nft
     assert await nft_wallet_maker.get_nft_count() == 1
     assert await nft_wallet_taker.get_nft_count() == 1
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN], reason="save time")
+@pytest.mark.parametrize("trusted", [True, False])
+@pytest.mark.parametrize("reuse_puzhash", [True, False])
+@pytest.mark.anyio
+async def test_nft_offer_nft0_and_xch_for_cat(
+    self_hostname: str,
+    two_wallet_nodes: Any,
+    trusted: Any,
+    reuse_puzhash: bool,
+    seeded_random: random.Random,
+) -> None:
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_server = full_node_api.server
+    wallet_node_0, server_0 = wallets[0]
+    wallet_node_1, server_1 = wallets[1]
+    wallet_maker = wallet_node_0.wallet_state_manager.main_wallet
+    wallet_taker = wallet_node_1.wallet_state_manager.main_wallet
+    maker_ph = await wallet_maker.get_new_puzzlehash()
+    taker_ph = await wallet_taker.get_new_puzzlehash()
+    token_ph = bytes32.random(seeded_random)
+    if trusted:
+        wallet_node_0.config["trusted_peers"] = {
+            full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
+        }
+        wallet_node_1.config["trusted_peers"] = {
+            full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
+        }
+    else:
+        wallet_node_0.config["trusted_peers"] = {}
+        wallet_node_1.config["trusted_peers"] = {}
+    await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(maker_ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(taker_ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0, wallet_node_1], timeout=20)
+    funds = sum([calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, 2)])
+    await time_out_assert(20, wallet_maker.get_unconfirmed_balance, funds)
+    await time_out_assert(20, wallet_maker.get_confirmed_balance, funds)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(token_ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0, wallet_node_1], timeout=20)
+    tx_config = DEFAULT_TX_CONFIG.override(reuse_puzhash=reuse_puzhash)
+    # Create NFT wallets and nfts for maker and taker
+    nft_wallet_maker = await NFTWallet.create_new_nft_wallet(
+        wallet_node_0.wallet_state_manager, wallet_maker, name="NFT WALLET 1"
+    )
+    nft_wallet_taker = await NFTWallet.create_new_nft_wallet(
+        wallet_node_1.wallet_state_manager, wallet_taker, name="NFT WALLET 2"
+    )
+    trade_manager_maker = wallet_maker.wallet_state_manager.trade_manager
+    trade_manager_taker = wallet_taker.wallet_state_manager.trade_manager
+    metadata = Program.to(
+        [
+            ("u", ["https://www.chia.net/img/branding/chia-logo.svg"]),
+            ("h", "0xD4584AD463139FA8C0D9F68F4B59F185"),
+        ]
+    )
+    txs = await nft_wallet_maker.generate_new_nft(metadata, tx_config)
+    txs = await wallet_maker.wallet_state_manager.add_pending_transactions(txs)
+    for tx in txs:
+        if tx.spend_bundle is not None:
+            await time_out_assert_not_none(
+                20, full_node_api.full_node.mempool_manager.get_spendbundle, tx.spend_bundle.name()
+            )
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(token_ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0, wallet_node_1], timeout=20)
+    coins_maker = await nft_wallet_maker.get_current_nfts()
+    assert len(coins_maker) == 1
+    assert await nft_wallet_taker.get_nft_count() == 0
+    # Create two new CATs and wallets for maker and taker
+    cats_to_mint = 10000
+    async with wallet_node_0.wallet_state_manager.lock:
+        cat_wallet_maker, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node_0.wallet_state_manager,
+            wallet_maker,
+            {"identifier": "genesis_by_id"},
+            uint64(cats_to_mint),
+            tx_config,
+        )
+        await time_out_assert(20, mempool_not_empty, True, full_node_api)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(token_ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0, wallet_node_1], timeout=20)
+    async with wallet_node_1.wallet_state_manager.lock:
+        cat_wallet_taker, _ = await CATWallet.create_new_cat_wallet(
+            wallet_node_1.wallet_state_manager,
+            wallet_taker,
+            {"identifier": "genesis_by_id"},
+            uint64(cats_to_mint),
+            tx_config,
+        )
+        await time_out_assert(20, mempool_not_empty, True, full_node_api)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(token_ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0, wallet_node_1], timeout=20)
+    await time_out_assert(20, cat_wallet_maker.get_confirmed_balance, cats_to_mint)
+    await time_out_assert(20, cat_wallet_maker.get_unconfirmed_balance, cats_to_mint)
+    await time_out_assert(20, cat_wallet_taker.get_confirmed_balance, cats_to_mint)
+    await time_out_assert(20, cat_wallet_taker.get_unconfirmed_balance, cats_to_mint)
+    wallet_maker_for_taker_cat: CATWallet = await CATWallet.get_or_create_wallet_for_cat(
+        wallet_node_0.wallet_state_manager, wallet_maker, cat_wallet_taker.get_asset_id()
+    )
+    wallet_taker_for_maker_cat: CATWallet = await CATWallet.get_or_create_wallet_for_cat(
+        wallet_node_1.wallet_state_manager, wallet_taker, cat_wallet_maker.get_asset_id()
+    )
+    assert wallet_taker_for_maker_cat
+    # MAKE FIRST TRADE: 1 NFT for 10 taker cats
+    maker_balance_pre = await wallet_maker.get_confirmed_balance()
+    taker_balance_pre = await wallet_taker.get_confirmed_balance()
+    taker_cat_maker_balance_pre = await wallet_maker_for_taker_cat.get_confirmed_balance()
+    taker_cat_taker_balance_pre = await cat_wallet_taker.get_confirmed_balance()
+    nft_to_offer = coins_maker[0]
+    nft_info: Optional[PuzzleInfo] = match_puzzle(uncurry_puzzle(nft_to_offer.full_puzzle))
+    nft_asset_id: bytes32 = create_asset_id(nft_info)  # type: ignore
+    driver_dict: Dict[bytes32, Optional[PuzzleInfo]] = {nft_asset_id: nft_info}
+    maker_fee = uint64(10)
+    maker_xch_offered = 1000
+    taker_cat_offered = 2500
+    wallet_maker_id = wallet_maker.id()
+    offer_nft_for_cat = {
+        wallet_maker_id: -maker_xch_offered,
+        nft_asset_id: -1,
+        wallet_maker_for_taker_cat.id(): taker_cat_offered,
+    }
+    maker_unused_index = (
+        await wallet_maker.wallet_state_manager.puzzle_store.get_current_derivation_record_for_wallet(uint32(1))
+    ).index
+    taker_unused_index = (
+        await wallet_taker.wallet_state_manager.puzzle_store.get_current_derivation_record_for_wallet(uint32(1))
+    ).index
+    success, trade_make, _, error = await trade_manager_maker.create_offer_for_ids(
+        offer_nft_for_cat, tx_config, driver_dict, fee=maker_fee
+    )
+    assert success is True
+    assert error is None
+    assert trade_make is not None
+    taker_fee = uint64(1)
+    peer = wallet_node_1.get_full_node_peer()
+    trade_take, tx_records = await trade_manager_taker.respond_to_offer(
+        Offer.from_bytes(trade_make.offer),
+        peer,
+        tx_config,
+        fee=taker_fee,
+    )
+    assert trade_take is not None
+    assert tx_records is not None
+    tx_records = await trade_manager_taker.wallet_state_manager.add_pending_transactions(tx_records)
+    await full_node_api.process_transaction_records(records=tx_records)
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0, wallet_node_1], timeout=20)
+    await time_out_assert(20, get_trade_and_status, TradeStatus.CONFIRMED, trade_manager_maker, trade_make)
+    await time_out_assert(20, get_trade_and_status, TradeStatus.CONFIRMED, trade_manager_taker, trade_take)
+    taker_cat_maker_balance_post = await wallet_maker_for_taker_cat.get_confirmed_balance()
+    taker_cat_taker_balance_post = await cat_wallet_taker.get_confirmed_balance()
+    assert taker_cat_maker_balance_post == taker_cat_maker_balance_pre + taker_cat_offered
+    assert taker_cat_taker_balance_post == taker_cat_taker_balance_pre - taker_cat_offered
+    maker_balance_post = await wallet_maker.get_confirmed_balance()
+    taker_balance_post = await wallet_taker.get_confirmed_balance()
+    assert maker_balance_post == maker_balance_pre - maker_fee - maker_xch_offered
+    assert taker_balance_post == taker_balance_pre - taker_fee + maker_xch_offered
+    coins_taker = await nft_wallet_taker.get_current_nfts()
+    assert len(coins_taker) == 1
+    assert await nft_wallet_maker.get_nft_count() == 0
+    if reuse_puzhash:
+        # Check if unused index changed
+        assert (
+            maker_unused_index
+            == (
+                await wallet_maker.wallet_state_manager.puzzle_store.get_current_derivation_record_for_wallet(uint32(1))
+            ).index
+        )
+        assert (
+            taker_unused_index
+            == (
+                await wallet_taker.wallet_state_manager.puzzle_store.get_current_derivation_record_for_wallet(uint32(1))
+            ).index
+        )
+    else:
+        assert (
+            maker_unused_index
+            < (
+                await wallet_maker.wallet_state_manager.puzzle_store.get_current_derivation_record_for_wallet(uint32(1))
+            ).index
+        )
+        assert (
+            taker_unused_index
+            < (
+                await wallet_taker.wallet_state_manager.puzzle_store.get_current_derivation_record_for_wallet(uint32(1))
+            ).index
+        )
+    # Make an offer for taker NFT for multiple cats
+    maker_cat_amount = 400
+    taker_cat_amount = 500
+    nft_to_buy = coins_taker[0]
+    nft_to_buy_info: Optional[PuzzleInfo] = match_puzzle(uncurry_puzzle(nft_to_buy.full_puzzle))
+    nft_to_buy_asset_id: bytes32 = create_asset_id(nft_to_buy_info)  # type: ignore
+    driver_dict_to_buy: Dict[bytes32, Optional[PuzzleInfo]] = {
+        nft_to_buy_asset_id: nft_to_buy_info,
+    }
+    maker_fee = uint64(10)
+    offer_multi_cats_for_nft = {
+        nft_to_buy_asset_id: 1,
+        wallet_maker_for_taker_cat.id(): -taker_cat_amount,
+        cat_wallet_maker.id(): -maker_cat_amount,
+    }
+    success, trade_make, _, error = await trade_manager_maker.create_offer_for_ids(
+        offer_multi_cats_for_nft, tx_config, driver_dict_to_buy, fee=maker_fee
+    )
+    assert success is True
+    assert error is None
+    assert trade_make is not None
+    taker_fee = uint64(1)
+    trade_take, tx_records = await trade_manager_taker.respond_to_offer(
+        Offer.from_bytes(trade_make.offer), peer, tx_config, fee=taker_fee
+    )
+    assert trade_take is not None
+    assert tx_records is not None
+    tx_records = await trade_manager_taker.wallet_state_manager.add_pending_transactions(tx_records)
+    await full_node_api.process_transaction_records(records=tx_records)
+    # check balances: taker wallet down an NFT, up cats
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[wallet_node_0, wallet_node_1], timeout=20)
+    await time_out_assert(20, get_trade_and_status, TradeStatus.CONFIRMED, trade_manager_maker, trade_make)
+    await time_out_assert(20, get_trade_and_status, TradeStatus.CONFIRMED, trade_manager_taker, trade_take)
+    taker_cat_maker_balance_post_2 = await wallet_maker_for_taker_cat.get_confirmed_balance()
+    taker_cat_taker_balance_post_2 = await cat_wallet_taker.get_confirmed_balance()
+    assert taker_cat_maker_balance_post_2 == taker_cat_maker_balance_post - taker_cat_amount
+    assert taker_cat_taker_balance_post_2 == taker_cat_taker_balance_post + taker_cat_amount
+    maker_balance_post_2 = await wallet_maker.get_confirmed_balance()
+    taker_balance_post_2 = await wallet_taker.get_confirmed_balance()
+    assert maker_balance_post_2 == maker_balance_post - maker_fee
+    assert taker_balance_post_2 == taker_balance_post - taker_fee
+    assert await nft_wallet_maker.get_nft_count() == 1
+    assert await nft_wallet_taker.get_nft_count() == 0

tests/wallet/nft_wallet/test_nft_wallet.py CHANGED Viewed

         @@@ -1,6 -1,6 +1,7 @@@
 from __future__ import annotations
 import asyncio
+import sys
 import time
 from typing import Any, Awaitable, Callable, Dict, List, Optional
         @@@ -22,6 -22,6 +23,7 @@@ from chia.util.byte_types import hexstr
 from chia.util.ints import uint32, uint64
 from chia.util.timing import adjusted_timeout
 from chia.wallet.did_wallet.did_wallet import DIDWallet
+from chia.wallet.nft_wallet.nft_info import NFTInfo
 from chia.wallet.nft_wallet.nft_wallet import NFTWallet
 from chia.wallet.transaction_record import TransactionRecord
 from chia.wallet.util.address_type import AddressType
         @@@ -31,6 -31,6 +33,7 @@@ from chia.wallet.util.wallet_types impo
 from chia.wallet.wallet_node import WalletNode
 from chia.wallet.wallet_state_manager import WalletStateManager
 from tests.conftest import ConsensusMode
+from tests.util.setup_nodes import OldSimulatorsAndWallets
 from tests.util.time_out_assert import time_out_assert, time_out_assert_not_none
         @@@ -44,10 -44,10 +47,10 @@@ async def get_wallet_number(manager: Wa
 async def wait_rpc_state_condition(
     timeout: float,
-    async_function: Callable[[Dict[str, Any]], Awaitable[Dict]],
-    params: List[Dict],
+    async_function: Callable[[Dict[str, Any]], Awaitable[Dict[str, Any]]],
+    params: List[Dict[str, Any]],
     condition_func: Callable[[Dict[str, Any]], bool],
-) -> Dict:
+) -> Dict[str, Any]:
     __tracebackhide__ = True
     timeout = adjusted_timeout(timeout=timeout)
         @@@ -71,7 -71,7 +74,7 @@@
 async def make_new_block_with(
-    resp: Dict, full_node_api: FullNodeSimulator, ph: bytes32, node_to_sync: Optional[WalletNode] = None
+    resp: Dict[str, Any], full_node_api: FullNodeSimulator, ph: bytes32, node_to_sync: Optional[WalletNode] = None
 ) -> SpendBundle:
     assert resp.get("success")
     sb = resp["spend_bundle"]
         @@@ -83,12 -83,12 +86,11 @@@
     return sb
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_wallet_creation_automatically(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_wallet_creation_automatically(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
     num_blocks = 3
     full_nodes, wallets, _ = two_wallet_nodes
     full_node_api = full_nodes[0]
         @@@ -115,7 -115,7 +117,7 @@@
     await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
     await server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     funds = sum(
         @@@ -124,10 -124,10 +126,10 @@@
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, funds)
     await time_out_assert(30, wallet_0.get_confirmed_balance, funds)
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph1))
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     await time_out_assert(30, wallet_0.get_pending_change_balance, 0)
         @@@ -135,21 -135,21 +137,18 @@@
         wallet_node_0.wallet_state_manager, wallet_0, name="NFT WALLET 1"
     )
     metadata = Program.to(
-        [
-            ("u", ["https://www.chia.net/img/branding/chia-logo.svg"]),
-            ("h", "0xD4584AD463139FA8C0D9F68F4B59F185"),
-        ]
+        [("u", ["https://www.chia.net/img/branding/chia-logo.svg"]), ("h", "0xD4584AD463139FA8C0D9F68F4B59F185")]
     )
     txs = await nft_wallet_0.generate_new_nft(metadata, DEFAULT_TX_CONFIG)
-    await nft_wallet_0.wallet_state_manager.add_pending_transactions(txs)
+    txs = await nft_wallet_0.wallet_state_manager.add_pending_transactions(txs)
     for tx in txs:
         if tx.spend_bundle is not None:
             await time_out_assert_not_none(
                 30, full_node_api.full_node.mempool_manager.get_spendbundle, tx.spend_bundle.name()
             )
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph1))
     await time_out_assert(30, get_nft_count, 1, nft_wallet_0)
         @@@ -165,7 -165,7 +164,7 @@@
     await time_out_assert_not_none(
         30, full_node_api.full_node.mempool_manager.get_spendbundle, txs[0].spend_bundle.name()
     )
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph1))
     async def num_wallets() -> int:
         @@@ -175,7 -175,7 +174,8 @@@
     # Get the new NFT wallet
     nft_wallets = await wallet_node_1.wallet_state_manager.get_all_wallet_info_entries(WalletType.NFT)
     assert len(nft_wallets) == 1
-    nft_wallet_1: NFTWallet = wallet_node_1.wallet_state_manager.wallets[nft_wallets[0].id]
+    nft_wallet_1 = wallet_node_1.wallet_state_manager.wallets[nft_wallets[0].id]
+    assert isinstance(nft_wallet_1, NFTWallet)
     await time_out_assert(30, get_nft_count, 0, nft_wallet_0)
     await time_out_assert(30, get_nft_count, 1, nft_wallet_1)
         @@@ -183,13 -183,13 +183,16 @@@
     assert await nft_wallet_1.get_nft_count() == 1
+@pytest.mark.skipif(sys.platform == "win32" and sys.version_info < (3, 9), reason="Flaky on Windows+3.8")
 @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN, ConsensusMode.HARD_FORK_2_0], reason="save time")
 @pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_wallet_creation_and_transfer(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_wallet_creation_and_transfer(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
     num_blocks = 2
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -198,6 -198,6 +201,10 @@@
     ph = await wallet_0.get_new_puzzlehash()
     ph1 = await wallet_1.get_new_puzzlehash()
+    async def ensure_wallet_sync() -> None:
+        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_0, timeout=20)
+        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_1, timeout=20)
     if trusted:
         wallet_node_0.config["trusted_peers"] = {
             full_node_api.full_node.server.node_id.hex(): full_node_api.full_node.server.node_id.hex()
         @@@ -212,7 -212,7 +219,7 @@@
     await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
     await server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     funds = sum(
         @@@ -221,10 -221,10 +228,10 @@@
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, funds)
     await time_out_assert(30, wallet_0.get_confirmed_balance, funds)
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph1))
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     await time_out_assert(30, wallet_0.get_pending_change_balance, 0)
         @@@ -232,10 -232,10 +239,7 @@@
         wallet_node_0.wallet_state_manager, wallet_0, name="NFT WALLET 1"
     )
     metadata = Program.to(
-        [
-            ("u", ["https://www.chia.net/img/branding/chia-logo.svg"]),
-            ("h", "0xD4584AD463139FA8C0D9F68F4B59F185"),
-        ]
+        [("u", ["https://www.chia.net/img/branding/chia-logo.svg"]), ("h", "0xD4584AD463139FA8C0D9F68F4B59F185")]
     )
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, 2000000000000)
         @@@ -249,7 -249,7 +253,7 @@@
                 30, full_node_api.full_node.mempool_manager.get_spendbundle, tx.spend_bundle.name()
             )
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     await time_out_assert(10, get_nft_count, 1, nft_wallet_0)
         @@@ -258,7 -258,7 +262,11 @@@
     # Test Reorg mint
     height = full_node_api.full_node.blockchain.get_peak_height()
     assert height is not None
     await full_node_api.reorg_from_index_to_new_index(ReorgProtocol(uint32(height - 1), uint32(height + 1), ph1, None))
+    await time_out_assert(60, full_node_api.full_node.blockchain.get_peak_height, height + 1)
     await time_out_assert(30, get_nft_count, 0, nft_wallet_0)
     await time_out_assert(30, get_wallet_number, 2, wallet_node_0.wallet_state_manager)
         @@@ -266,12 -266,12 +274,7 @@@
         wallet_node_0.wallet_state_manager, wallet_0, name="NFT WALLET 1"
     )
-    metadata = Program.to(
-        [
-            ("u", ["https://www.test.net/logo.svg"]),
-            ("h", "0xD4584AD463139FA8C0D9F68F4B59F181"),
-        ]
-    )
+    metadata = Program.to([("u", ["https://www.test.net/logo.svg"]), ("h", "0xD4584AD463139FA8C0D9F68F4B59F181")])
     await time_out_assert(10, wallet_0.get_unconfirmed_balance, 4000000000000 - 1)
     await time_out_assert(10, wallet_0.get_confirmed_balance, 4000000000000)
         @@@ -286,8 -286,8 +289,9 @@@
             )
     await time_out_assert(30, wallet_node_0.wallet_state_manager.lock.locked, False)
-    for i in range(1, num_blocks * 2):
+    for _ in range(1, num_blocks * 2):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph1))
     await time_out_assert(30, get_nft_count, 2, nft_wallet_0)
     coins = await nft_wallet_0.get_current_nfts()
     assert len(coins) == 2, "nft not generated"
         @@@ -307,8 -307,8 +311,11 @@@
     )
     assert len(compute_memos(txs[0].spend_bundle)) > 0
-    for i in range(1, num_blocks * 2):
+    for _ in range(1, num_blocks * 2):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph1))
+    await ensure_wallet_sync()
     await time_out_assert(30, get_nft_count, 1, nft_wallet_0)
     await time_out_assert(30, get_nft_count, 1, nft_wallet_1)
         @@@ -329,27 -329,27 +336,37 @@@
     )
     assert len(compute_memos(txs[0].spend_bundle)) > 0
-    for i in range(1, num_blocks):
+    await ensure_wallet_sync()
+    # We wish for the wallet to be in a specific state at this point after having
+    # become synced above.
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph1))
-    await time_out_assert(30, wallet_node_0.wallet_state_manager.lock.locked, False)
+    await ensure_wallet_sync()
+    # The wallets are locked so we still observe the conditions above.
     await time_out_assert(30, get_nft_count, 2, nft_wallet_0)
     await time_out_assert(30, get_nft_count, 0, nft_wallet_1)
     # Test Reorg
     height = full_node_api.full_node.blockchain.get_peak_height()
     assert height is not None
     await full_node_api.reorg_from_index_to_new_index(ReorgProtocol(uint32(height - 1), uint32(height + 2), ph1, None))
+    # Wait for wallet sync on all wallets.
+    await ensure_wallet_sync()
     await time_out_assert(30, get_nft_count, 1, nft_wallet_0)
     await time_out_assert(30, get_nft_count, 1, nft_wallet_1)
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_wallet_rpc_creation_and_list(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_wallet_rpc_creation_and_list(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
     num_blocks = 3
     full_nodes, wallets, _ = two_wallet_nodes
     full_node_api = full_nodes[0]
         @@@ -376,7 -376,7 +393,7 @@@
     await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
     await server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     funds = sum(
         [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks - 1)]
         @@@ -407,7 -407,7 +424,7 @@@
     sb = tr1["spend_bundle"]
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, sb.name())
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     await wait_rpc_state_condition(30, api_0.nft_get_nfts, [dict(wallet_id=nft_wallet_0_id)], lambda x: x["nft_list"])
         @@@ -427,15 -427,15 +444,12 @@@
     assert tr2.get("success")
     sb = tr2["spend_bundle"]
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, sb.name())
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     coins_response = await wait_rpc_state_condition(
-        5,
-        api_0.nft_get_nfts,
-        [{"wallet_id": nft_wallet_0_id}],
-        lambda x: x["success"] and len(x["nft_list"]) == 2,
+        5, api_0.nft_get_nfts, [{"wallet_id": nft_wallet_0_id}], lambda x: x["success"] and len(x["nft_list"]) == 2
     )
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     uris = []
     for coin in coins:
         assert not coin.supports_did
         @@@ -469,12 -469,12 +483,11 @@@
     assert resp.get("count") is None
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_wallet_rpc_update_metadata(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_wallet_rpc_update_metadata(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
     num_blocks = 3
     full_nodes, wallets, _ = two_wallet_nodes
     full_node_api = full_nodes[0]
         @@@ -498,7 -498,7 +511,7 @@@
         wallet_node_0.config["trusted_peers"] = {}
         wallet_node_1.config["trusted_peers"] = {}
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
         @@@ -535,14 -535,14 +548,14 @@@
     sb = resp["spend_bundle"]
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, sb.name())
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     coins_response = await wait_rpc_state_condition(
         5, api_0.nft_get_nfts, [dict(wallet_id=nft_wallet_0_id)], lambda x: x["nft_list"]
     )
     assert coins_response["nft_list"], isinstance(coins_response, dict)
     assert coins_response.get("success")
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     coin = coins[0].to_json_dict()
     assert coin["mint_height"] > 0
     assert coin["data_hash"] == "0xd4584ad463139fa8c0d9f68f4b59f185"
         @@@ -567,13 -567,13 +580,14 @@@
         {"wallet_id": nft_wallet_0_id, "nft_coin_id": nft_coin_id, "uri": "http://metadata", "key": "mu"}
     )
-    assert isinstance(tr1, dict)
     assert tr1.get("success")
     coins_response = await api_0.nft_get_nfts(dict(wallet_id=nft_wallet_0_id))
-    assert coins_response["nft_list"][0].pending_transaction
+    coins = coins_response["nft_list"]
+    assert coins[0].pending_transaction
     sb = tr1["spend_bundle"]
+    assert isinstance(sb, SpendBundle)
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, sb.name())
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     # check that new URI was added
     coins_response = await wait_rpc_state_condition(
         @@@ -597,19 -597,19 +611,14 @@@
     await time_out_assert(30, wallet_0.get_pending_change_balance, 0)
     nft_coin_id = coin["nft_coin_id"]
     tr1 = await api_0.nft_add_uri(
-        {
-            "wallet_id": nft_wallet_0_id,
-            "nft_coin_id": nft_coin_id,
-            "uri": "http://data",
-            "key": "u",
-        }
+        {"wallet_id": nft_wallet_0_id, "nft_coin_id": nft_coin_id, "uri": "http://data", "key": "u"}
     )
     assert isinstance(tr1, dict)
     assert tr1.get("success")
     sb = tr1["spend_bundle"]
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, sb.name())
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     coins_response = await wait_rpc_state_condition(
         5,
         @@@ -627,15 -627,15 +636,14 @@@
     assert "http://data" == coin["data_uris"][0]
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_with_did_wallet_creation(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_with_did_wallet_creation(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
     num_blocks = 3
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -666,12 -666,12 +674,10 @@@
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, funds)
     await time_out_assert(30, wallet_0.get_confirmed_balance, funds)
-    did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-        wallet_node_0.wallet_state_manager, wallet_0, uint64(1)
-    )
+    did_wallet = await DIDWallet.create_new_did_wallet(wallet_node_0.wallet_state_manager, wallet_0, uint64(1))
     spend_bundle_list = await wallet_node_0.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(did_wallet.id())
     spend_bundle = spend_bundle_list[0].spend_bundle
+    assert spend_bundle is not None
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
     await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
         @@@ -715,7 -715,7 +721,7 @@@
     assert res.get("did_id") == hmr_did_id
     # Create a NFT with DID
-    nft_ph: bytes32 = await wallet_0.get_new_puzzlehash()
+    nft_ph = await wallet_0.get_new_puzzlehash()
     resp = await api_0.nft_mint_nft(
         {
             "wallet_id": nft_wallet_0_id,
         @@@ -768,7 -768,7 +774,7 @@@
     coins_response = await wait_rpc_state_condition(
         5, api_0.nft_get_nfts, [dict(wallet_id=nft_wallet_0_id)], lambda x: x["nft_list"]
     )
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     assert len(coins) == 1
     did_nft = coins[0].to_json_dict()
     assert did_nft["mint_height"] > 0
         @@@ -794,15 -794,15 +800,12 @@@
     assert non_did_nft["owner_did"] is None
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_rpc_mint(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_rpc_mint(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
     num_blocks = 3
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -835,12 -835,12 +838,10 @@@
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, funds)
     await time_out_assert(30, wallet_0.get_confirmed_balance, funds)
-    did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-        wallet_node_0.wallet_state_manager, wallet_0, uint64(1)
-    )
+    did_wallet = await DIDWallet.create_new_did_wallet(wallet_node_0.wallet_state_manager, wallet_0, uint64(1))
     spend_bundle_list = await wallet_node_0.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(did_wallet.id())
     spend_bundle = spend_bundle_list[0].spend_bundle
+    assert spend_bundle is not None
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
     for _ in range(1, num_blocks):
         @@@ -884,21 -884,21 +885,21 @@@
         }
     )
     assert resp.get("success")
-    nft_id: str = str(resp.get("nft_id"))
+    nft_id = str(resp.get("nft_id"))
     sb = resp["spend_bundle"]
     # ensure hints are generated
     assert len(compute_memos(sb)) > 0
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, sb.name())
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, 9999999999998)
     await time_out_assert(30, wallet_0.get_confirmed_balance, 9999999999998)
     coins_response = await wait_rpc_state_condition(
         5, api_0.nft_get_nfts, [dict(wallet_id=nft_wallet_0_id)], lambda x: x["nft_list"]
     )
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     assert len(coins) == 1
     did_nft = coins[0]
     assert did_nft.royalty_puzzle_hash == royalty_address
         @@@ -913,16 -913,16 +914,15 @@@
     assert decode_puzzle_hash(nft_id) == did_nft.launcher_id
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_transfer_nft_with_did(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_transfer_nft_with_did(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
     num_blocks = 3
     fee = 100
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -958,12 -958,12 +958,10 @@@
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, funds)
     await time_out_assert(30, wallet_0.get_confirmed_balance, funds)
     # Create DID
-    did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-        wallet_node_0.wallet_state_manager, wallet_0, uint64(1)
-    )
+    did_wallet = await DIDWallet.create_new_did_wallet(wallet_node_0.wallet_state_manager, wallet_0, uint64(1))
     spend_bundle_list = await wallet_node_0.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(did_wallet.id())
     spend_bundle = spend_bundle_list[0].spend_bundle
+    assert spend_bundle is not None
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
     await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
         @@@ -1000,8 -1000,8 +998,9 @@@
     )
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, 5999999999898)
     await time_out_assert(30, wallet_0.get_confirmed_balance, 5999999999898)
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     assert len(coins) == 1
+    assert coins[0].owner_did is not None
     assert coins[0].owner_did.hex() == hex_did_id
     assert len(wallet_1.wallet_state_manager.wallets) == 1, "NFT wallet shouldn't exist yet"
         @@@ -1010,13 -1010,13 +1009,13 @@@
     await full_node_api.wait_for_wallet_synced(wallet_node_1, 20)
     # transfer DID to the other wallet
     txs = await did_wallet.transfer_did(ph1, uint64(0), True, DEFAULT_TX_CONFIG)
+    txs = await did_wallet.wallet_state_manager.add_pending_transactions(txs)
     for tx in txs:
-        await did_wallet.wallet_state_manager.add_pending_transactions(txs)
         if tx.spend_bundle is not None:
             await time_out_assert_not_none(
                 30, full_node_api.full_node.mempool_manager.get_spendbundle, tx.spend_bundle.name()
             )
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph1))
     await full_node_api.wait_for_wallet_synced(wallet_node_0, 20)
     await full_node_api.wait_for_wallet_synced(wallet_node_1, 20)
         @@@ -1041,7 -1041,7 +1040,7 @@@
     # wait for all wallets to be created
     await time_out_assert(30, len, 3, wallet_1.wallet_state_manager.wallets)
-    did_wallet_1 = wallet_1.wallet_state_manager.wallets[2]
+    did_wallet_1 = wallet_1.wallet_state_manager.wallets[uint32(2)]
     assert nft_wallet_0_id not in wallet_node_0.wallet_state_manager.wallets.keys()
     # Check if the NFT owner DID is reset
     resp = await api_1.nft_get_by_did({})
         @@@ -1081,18 -1081,18 +1080,18 @@@
     )
     coins = resp["nft_list"]
     assert len(coins) == 1
+    assert coins[0].owner_did is not None
     assert coins[0].owner_did.hex() == hex_did_id
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_update_metadata_for_nft_did(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_update_metadata_for_nft_did(
+    self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool
+) -> None:
     num_blocks = 3
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -1125,12 -1125,12 +1124,11 @@@
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, funds)
     await time_out_assert(30, wallet_0.get_confirmed_balance, funds)
-    did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-        wallet_node_0.wallet_state_manager, wallet_0, uint64(1)
-    )
+    did_wallet = await DIDWallet.create_new_did_wallet(wallet_node_0.wallet_state_manager, wallet_0, uint64(1))
     spend_bundle_list = await wallet_node_0.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(did_wallet.id())
     spend_bundle = spend_bundle_list[0].spend_bundle
+    assert spend_bundle is not None
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
     for _ in range(1, num_blocks):
         @@@ -1165,7 -1165,7 +1163,7 @@@
     assert len(compute_memos(sb)) > 0
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, sb.name())
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
     # Check DID NFT
         @@@ -1173,8 -1173,8 +1171,9 @@@
     coins_response = await wait_rpc_state_condition(
         30, api_0.nft_get_nfts, [dict(wallet_id=nft_wallet_0_id)], lambda x: x["nft_list"]
     )
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     assert len(coins) == 1
+    assert coins[0].minter_did is not None
     assert coins[0].minter_did.hex() == hex_did_id
     nft_coin_id = coins[0].nft_coin_id
         @@@ -1195,7 -1195,7 +1194,7 @@@
     sb = tr1["spend_bundle"]
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, sb.name())
-    for i in range(1, num_blocks):
+    for _ in range(1, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph1))
     # check that new URI was added
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, 11999999999898)
         @@@ -1218,15 -1218,15 +1217,12 @@@
     assert len(coin["license_uris"]) == 0
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_bulk_set_did(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_bulk_set_did(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
     num_blocks = 2
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -1257,11 -1257,11 +1253,10 @@@
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, funds)
     await time_out_assert(30, wallet_0.get_confirmed_balance, funds)
-    did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-        wallet_node_0.wallet_state_manager, wallet_0, uint64(1)
-    )
+    did_wallet = await DIDWallet.create_new_did_wallet(wallet_node_0.wallet_state_manager, wallet_0, uint64(1))
     spend_bundle_list = await wallet_node_0.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(did_wallet.id())
     spend_bundle = spend_bundle_list[0].spend_bundle
+    assert spend_bundle is not None
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
     for _ in range(1, num_blocks):
         @@@ -1274,13 -1274,13 +1269,13 @@@
     await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node_0, timeout=30)
     res = await api_0.create_new_wallet(dict(wallet_type="nft_wallet", name="NFT WALLET 1", did_id=hmr_did_id))
-    assert isinstance(res, dict)
     assert res.get("success")
     nft_wallet_0_id = res["wallet_id"]
+    assert isinstance(nft_wallet_0_id, uint32)
     res = await api_0.create_new_wallet(dict(wallet_type="nft_wallet", name="NFT WALLET 2"))
-    assert isinstance(res, dict)
     assert res.get("success")
     nft_wallet_1_id = res["wallet_id"]
+    assert isinstance(nft_wallet_1_id, uint32)
     await time_out_assert(30, did_wallet.get_confirmed_balance, 1)
     # Create a NFT with DID
         @@@ -1332,7 -1332,7 +1327,7 @@@
     coins_response = await wait_rpc_state_condition(
         30, api_0.nft_get_nfts, [{"wallet_id": nft_wallet_0_id}], lambda x: len(x["nft_list"]) == 2
     )
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     nft1 = coins[0]
     nft12 = coins[1]
     assert len(coins) == 2
         @@@ -1353,8 -1353,8 +1348,12 @@@
         {"nft_coin_id": nft2.nft_coin_id.hex()},
     ]
     resp = await api_0.nft_set_did_bulk(dict(did_id=hmr_did_id, nft_coin_list=nft_coin_list, fee=1000))
-    assert len(resp["spend_bundle"].coin_spends) == 5
-    assert resp["tx_num"] == 4
+    sb = resp["spend_bundle"]
+    assert isinstance(sb, SpendBundle)
+    assert len(sb.coin_spends) == 5
+    tx_num = resp["tx_num"]
+    assert isinstance(tx_num, int)
+    assert tx_num == 4
     coins_response = await wait_rpc_state_condition(
         30, api_0.nft_get_nfts, [{"wallet_id": nft_wallet_0_id}], lambda x: len(x["nft_list"]) == 2
     )
         @@@ -1373,23 -1373,23 +1372,25 @@@
         [dict(wallet_id=nft_wallet_1_id)],
         lambda x: len(x["nft_list"]) > 2 and x["nft_list"][0].owner_did,
     )
-    assert await wallet_node_0.wallet_state_manager.wallets[nft_wallet_0_id].get_nft_count() == 3
+    nft_wallet_to_check = wallet_node_0.wallet_state_manager.wallets[nft_wallet_0_id]
+    assert isinstance(nft_wallet_to_check, NFTWallet)
+    assert await nft_wallet_to_check.get_nft_count() == 3
     coins = resp["nft_list"]
     assert len(coins) == 3
+    assert coins[0].owner_did is not None
     assert coins[0].owner_did.hex() == hex_did_id
+    assert coins[1].owner_did is not None
     assert coins[1].owner_did.hex() == hex_did_id
+    assert coins[2].owner_did is not None
     assert coins[2].owner_did.hex() == hex_did_id
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_bulk_transfer(two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_bulk_transfer(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
     num_blocks = 2
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -1411,8 -1411,8 +1412,8 @@@
         wallet_node_0.config["trusted_peers"] = {}
         wallet_node_1.config["trusted_peers"] = {}
-    await server_0.start_client(PeerInfo("127.0.0.1", full_node_server.get_port()), None)
-    await server_1.start_client(PeerInfo("127.0.0.1", full_node_server.get_port()), None)
+    await server_0.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    await server_1.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
     for _ in range(1, num_blocks + 1):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
         @@@ -1423,11 -1423,11 +1424,10 @@@
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, funds)
     await time_out_assert(30, wallet_0.get_confirmed_balance, funds)
-    did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-        wallet_node_0.wallet_state_manager, wallet_0, uint64(1)
-    )
+    did_wallet = await DIDWallet.create_new_did_wallet(wallet_node_0.wallet_state_manager, wallet_0, uint64(1))
     spend_bundle_list = await wallet_node_0.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(did_wallet.id())
     spend_bundle = spend_bundle_list[0].spend_bundle
+    assert spend_bundle is not None
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
     for _ in range(1, num_blocks):
         @@@ -1496,7 -1496,7 +1496,7 @@@
     coins_response = await wait_rpc_state_condition(
         30, api_0.nft_get_nfts, [{"wallet_id": nft_wallet_0_id}], lambda x: len(x["nft_list"]) == 2
     )
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     nft1 = coins[0]
     nft12 = coins[1]
     assert len(coins) == 2
         @@@ -1539,10 -1539,10 +1539,10 @@@
 @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN, ConsensusMode.HARD_FORK_2_0], reason="save time")
 @pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_set_did(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_set_did(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
     num_blocks = 3
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -1573,11 -1573,11 +1573,10 @@@
     await time_out_assert(30, wallet_0.get_unconfirmed_balance, funds)
     await time_out_assert(30, wallet_0.get_confirmed_balance, funds)
-    did_wallet: DIDWallet = await DIDWallet.create_new_did_wallet(
-        wallet_node_0.wallet_state_manager, wallet_0, uint64(1)
-    )
+    did_wallet = await DIDWallet.create_new_did_wallet(wallet_node_0.wallet_state_manager, wallet_0, uint64(1))
     spend_bundle_list = await wallet_node_0.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(did_wallet.id())
     spend_bundle = spend_bundle_list[0].spend_bundle
+    assert spend_bundle is not None
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
     for _ in range(1, num_blocks):
         @@@ -1613,18 -1613,18 +1612,17 @@@
     coins_response = await wait_rpc_state_condition(
         30, api_0.nft_get_nfts, [{"wallet_id": nft_wallet_0_id}], lambda x: len(x["nft_list"]) > 0
     )
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     assert len(coins) == 1
     assert coins[0].owner_did is None
     nft_coin_id = coins[0].nft_coin_id
     # Test set None -> DID1
-    did_wallet1: DIDWallet = await DIDWallet.create_new_did_wallet(
-        wallet_node_0.wallet_state_manager, wallet_0, uint64(1)
-    )
+    did_wallet1 = await DIDWallet.create_new_did_wallet(wallet_node_0.wallet_state_manager, wallet_0, uint64(1))
     spend_bundle_list = await wallet_node_0.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(did_wallet1.id())
     spend_bundle = spend_bundle_list[0].spend_bundle
+    assert spend_bundle is not None
     await time_out_assert_not_none(30, full_node_api.full_node.mempool_manager.get_spendbundle, spend_bundle.name())
     await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
         @@@ -1647,10 -1647,10 +1645,13 @@@
         [dict(wallet_id=nft_wallet_1_id)],
         lambda x: len(x["nft_list"]) > 0 and x["nft_list"][0].owner_did,
     )
-    assert len(await wallet_node_0.wallet_state_manager.wallets[nft_wallet_0_id].get_current_nfts()) == 0
+    nft_wallet_to_check = wallet_node_0.wallet_state_manager.wallets[nft_wallet_0_id]
+    assert isinstance(nft_wallet_to_check, NFTWallet)
+    assert len(await nft_wallet_to_check.get_current_nfts()) == 0
     coins = resp["nft_list"]
     assert len(coins) == 1
+    assert coins[0].owner_did is not None
     assert coins[0].owner_did.hex() == hex_did_id
     nft_coin_id = coins[0].nft_coin_id
         @@@ -1682,6 -1682,6 +1683,7 @@@
     assert resp.get("success")
     coins = resp["nft_list"]
     assert len(coins) == 1
+    assert coins[0].owner_did is not None
     assert coins[0].owner_did.hex() == hex_did_id
     nft_coin_id = coins[0].nft_coin_id
     resp = await api_0.nft_get_info(dict(coin_id=nft_coin_id.hex(), latest=True))
         @@@ -1707,15 -1707,15 +1709,12 @@@
     assert coins[0] == resp["nft_info"]
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_set_nft_status(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_set_nft_status(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
     num_blocks = 5
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -1776,7 -1776,7 +1775,7 @@@
     )
     assert coins_response["nft_list"], isinstance(coins_response, dict)
     assert coins_response.get("success")
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     assert len(coins) == 1
     assert coins[0].owner_did is None
     assert not coins[0].pending_transaction
         @@@ -1793,15 -1793,15 +1792,12 @@@
     assert coins[0].pending_transaction
-@pytest.mark.parametrize(
-    "trusted",
-    [True, False],
-)
+@pytest.mark.parametrize("trusted", [True, False])
 @pytest.mark.anyio
-async def test_nft_sign_message(self_hostname: str, two_wallet_nodes: Any, trusted: Any) -> None:
+async def test_nft_sign_message(self_hostname: str, two_wallet_nodes: OldSimulatorsAndWallets, trusted: bool) -> None:
     num_blocks = 5
     full_nodes, wallets, _ = two_wallet_nodes
-    full_node_api: FullNodeSimulator = full_nodes[0]
+    full_node_api = full_nodes[0]
     full_node_server = full_node_api.server
     wallet_node_0, server_0 = wallets[0]
     wallet_node_1, server_1 = wallets[1]
         @@@ -1862,7 -1862,7 +1858,7 @@@
     )
     assert coins_response["nft_list"], isinstance(coins_response, dict)
     assert coins_response.get("success")
-    coins = coins_response["nft_list"]
+    coins: List[NFTInfo] = coins_response["nft_list"]
     assert len(coins) == 1
     assert coins[0].owner_did is None
     assert not coins[0].pending_transaction
         @@@ -1871,7 -1871,7 +1867,7 @@@
     response = await api_0.sign_message_by_id(
         {"id": encode_puzzle_hash(coins[0].launcher_id, AddressType.NFT.value), "message": message}
     )
-    puzzle: Program = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, message))
+    puzzle = Program.to((CHIP_0002_SIGN_MESSAGE_PREFIX, message))
     assert AugSchemeMPL.verify(
         G1Element.from_bytes(bytes.fromhex(response["pubkey"])),
         puzzle.get_tree_hash(),

tests/wallet/rpc/test_wallet_rpc.py CHANGED Viewed

         @@@ -536,20 -536,20 +536,36 @@@ async def test_create_signed_transactio
     await farm_transaction(full_node_api, wallet_1_node, spend_bundle)
     await time_out_assert(20, get_confirmed_balance, generated_funds - amount_total, wallet_1_rpc, wallet_id)
-    # Validate the memos
+    # Assert every coin comes from the same parent
+    additions: List[Coin] = spend_bundle.additions()
+    assert len({c.parent_coin_info for c in additions}) == 2 if is_cat else 1
+    # Assert you can get the spend for each addition
+    for addition in additions:
+        cr: Optional[CoinRecord] = await full_node_rpc.get_coin_record_by_name(addition.name())
+        assert cr is not None
+        spend: Optional[CoinSpend] = await full_node_rpc.get_puzzle_and_solution(
+            addition.parent_coin_info, cr.confirmed_block_index
+        )
+        assert spend is not None
+    # Assert the memos are all correct
+    addition_dict: Dict[bytes32, Coin] = {addition.name(): addition for addition in additions}
+    memo_dictionary: Dict[bytes32, List[bytes]] = compute_memos(spend_bundle)
     for output in outputs:
-        if "memos" in outputs:
+        if "memos" in output:
             found: bool = False
-            for addition in spend_bundle.additions():
-                if addition.amount == output["amount"] and addition.puzzle_hash.hex() == output["puzzle_hash"]:
-                    cr: Optional[CoinRecord] = await full_node_rpc.get_coin_record_by_name(addition.name())
-                    assert cr is not None
-                    spend: Optional[CoinSpend] = await full_node_rpc.get_puzzle_and_solution(
-                        addition.parent_coin_info, cr.confirmed_block_index
-                    )
-                    assert spend is not None
-                    sb: SpendBundle = SpendBundle([spend], G2Element())
-                    assert compute_memos(sb) == {addition.name(): [memo.encode() for memo in output["memos"]]}
+            for addition_id, addition in addition_dict.items():
+                if (
+                    is_cat
+                    and addition.amount == output["amount"]
+                    and memo_dictionary[addition_id][0] == output["puzzle_hash"]
+                    and memo_dictionary[addition_id][1:] == [memo.encode() for memo in output["memos"]]
+                ) or (
+                    addition.amount == output["amount"]
+                    and addition.puzzle_hash == output["puzzle_hash"]
+                    and memo_dictionary[addition_id] == [memo.encode() for memo in output["memos"]]
+                ):
                     found = True
             assert found
         @@@ -913,13 -913,13 +929,12 @@@ async def test_get_transaction_count(wa
     assert len(all_transactions) > 0
     transaction_count = await client.get_transaction_count(1)
     assert transaction_count == len(all_transactions)
-    assert await client.get_transaction_count(1, confirmed=False) == 0
-    assert (
-        await client.get_transaction_count(
-            1, type_filter=TransactionTypeFilter.include([TransactionType.INCOMING_CLAWBACK_SEND])
-        )
-        == 0
+    transaction_count = await client.get_transaction_count(1, confirmed=False)
+    assert transaction_count == 0
+    transaction_count = await client.get_transaction_count(
+        1, type_filter=TransactionTypeFilter.include([TransactionType.INCOMING_CLAWBACK_SEND])
     )
+    assert transaction_count == 0
 @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN, ConsensusMode.HARD_FORK_2_0], reason="save time")
         @@@ -1825,12 -1825,12 +1840,12 @@@ async def test_select_coins_rpc(wallet_
             excluded_coin_ids=[c.name() for c in excluded_amt_coins]
         ),
     )
-    assert excluded_amt_coins not in all_coins
+    assert set(excluded_amt_coins).intersection({rec.coin for rec in all_coins}) == set()
     all_coins, _, _ = await client_2.get_spendable_coins(
         wallet_id=1,
         coin_selection_config=DEFAULT_COIN_SELECTION_CONFIG.override(excluded_coin_amounts=[uint64(1000)]),
     )
-    assert excluded_amt_coins not in all_coins
+    assert len([rec for rec in all_coins if rec.coin.amount == 1000]) == 0
     all_coins_2, _, _ = await client_2.get_spendable_coins(
         wallet_id=1,
         coin_selection_config=DEFAULT_COIN_SELECTION_CONFIG.override(max_coin_amount=uint64(999)),

tests/wallet/simple_sync/test_simple_sync_protocol.py CHANGED Viewed

         @@@ -17,6 -17,6 +17,7 @@@ from chia.server.outbound_message impor
 from chia.simulator.simulator_protocol import FarmNewBlockProtocol, ReorgProtocol
 from chia.simulator.wallet_tools import WalletTool
 from chia.types.blockchain_format.coin import Coin
+from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.coin_record import CoinRecord
 from chia.types.condition_opcodes import ConditionOpcode
 from chia.types.condition_with_args import ConditionWithArgs
         @@@ -30,16 -30,16 +31,10 @@@ from tests.connection_utils import add_
 from tests.util.setup_nodes import OldSimulatorsAndWallets
 from tests.util.time_out_assert import time_out_assert
-def wallet_height_at_least(wallet_node, h):
-    height = wallet_node.wallet_state_manager.blockchain._peak_height
-    if height == h:
-        return True
-    return False
 log = getLogger(__name__)
+zero_ph = bytes32(32 * b"\0")
 async def get_all_messages_in_queue(queue):
     all_messages = []
         @@@ -50,483 -50,483 +45,605 @@@
     return all_messages
-class TestSimpleSyncProtocol:
-    @pytest.mark.anyio
-    async def test_subscribe_for_ph(self, simulator_and_wallet, self_hostname):
-        num_blocks = 4
-        full_nodes, wallets, _ = simulator_and_wallet
-        full_node_api = full_nodes[0]
-        wallet_node, server_2 = wallets[0]
-        fn_server = full_node_api.full_node.server
-        wsm: WalletStateManager = wallet_node.wallet_state_manager
-        await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
-        incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
-        zero_ph = 32 * b"\0"
-        junk_ph = 32 * b"\a"
-        fake_wallet_peer = fn_server.all_connections[peer_id]
-        msg = wallet_protocol.RegisterForPhUpdates([zero_ph], 0)
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
-        data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
-        assert data_response.coin_states == []
-        # Farm few more with reward
-        for i in range(0, num_blocks):
-            if i == num_blocks - 1:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
-            else:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
-        msg = wallet_protocol.RegisterForPhUpdates([zero_ph], 0)
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
-        data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
-        # we have already subscribed to this puzzle hash, it will be ignored
-        # we still receive the updates (see below)
-        assert data_response.coin_states == []
-        # Farm more rewards to check the incoming queue for the updates
-        for i in range(0, num_blocks):
-            if i == num_blocks - 1:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
-            else:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
-        all_messages = await get_all_messages_in_queue(incoming_queue)
-        zero_coin = await full_node_api.full_node.coin_store.get_coin_states_by_puzzle_hashes(True, {zero_ph})
-        all_zero_coin = set(zero_coin)
-        notified_zero_coins = set()
-        for message in all_messages:
-            if message.type == ProtocolMessageTypes.coin_state_update.value:
-                data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
-                for coin_state in data_response.items:
-                    notified_zero_coins.add(coin_state)
-                assert len(data_response.items) == 2  # 2 per height farmer / pool reward
-        assert all_zero_coin == notified_zero_coins
-        # Test subscribing to more coins
-        one_ph = 32 * b"\1"
-        msg = wallet_protocol.RegisterForPhUpdates([one_ph], 0)
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
-        peak = full_node_api.full_node.blockchain.get_peak()
-        for i in range(0, num_blocks):
-            if i == num_blocks - 1:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
-            else:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
-        for i in range(0, num_blocks):
-            if i == num_blocks - 1:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(one_ph))
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
-            else:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(one_ph))
-        zero_coins = await full_node_api.full_node.coin_store.get_coin_states_by_puzzle_hashes(
-            True, {zero_ph}, peak.height + 1
-        )
-        one_coins = await full_node_api.full_node.coin_store.get_coin_states_by_puzzle_hashes(True, {one_ph})
+@pytest.mark.anyio
+async def test_subscribe_for_ph(simulator_and_wallet, self_hostname):
+    num_blocks = 4
+    full_nodes, wallets, _ = simulator_and_wallet
+    full_node_api = full_nodes[0]
+    wallet_node, server_2 = wallets[0]
+    fn_server = full_node_api.full_node.server
+    wsm: WalletStateManager = wallet_node.wallet_state_manager
-        all_coins = set(zero_coins)
-        all_coins.update(one_coins)
+    await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
+    incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
-        all_messages = await get_all_messages_in_queue(incoming_queue)
+    junk_ph = 32 * b"\a"
+    fake_wallet_peer = fn_server.all_connections[peer_id]
+    msg = wallet_protocol.RegisterForPhUpdates([zero_ph], 0)
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
-        notified_all_coins = set()
-        for message in all_messages:
-            if message.type == ProtocolMessageTypes.coin_state_update.value:
-                data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
-                for coin_state in data_response.items:
-                    notified_all_coins.add(coin_state)
-                assert len(data_response.items) == 2  # 2 per height farmer / pool reward
+    assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
+    data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
+    assert data_response.coin_states == []
-        assert all_coins == notified_all_coins
-        wsm: WalletStateManager = wallet_node.wallet_state_manager
-        wallet: Wallet = wsm.wallets[1]
-        puzzle_hash = await wallet.get_new_puzzlehash()
-        for i in range(0, num_blocks):
-            if i == num_blocks - 1:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(puzzle_hash))
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
-            else:
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(puzzle_hash))
-        funds = sum(
-            [
-                calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i))
-                for i in range(1, num_blocks + 1)
-            ]
-        )
-        fn_amount = sum(
-            cr.coin.amount
-            for cr in await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(False, puzzle_hash)
-        )
-        await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        assert funds == fn_amount
+    # Farm few more with reward
+    for i in range(0, num_blocks):
+        if i == num_blocks - 1:
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
+        else:
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
-        msg_1 = wallet_protocol.RegisterForPhUpdates([puzzle_hash], 0)
-        msg_response_1 = await full_node_api.register_interest_in_puzzle_hash(msg_1, fake_wallet_peer)
-        assert msg_response_1.type == ProtocolMessageTypes.respond_to_ph_update.value
-        data_response_1: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response_1.data)
-        assert len(data_response_1.coin_states) == 2 * num_blocks  # 2 per height farmer / pool reward
+    msg = wallet_protocol.RegisterForPhUpdates([zero_ph], 0)
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
+    assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
+    data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
+    # we have already subscribed to this puzzle hash, it will be ignored
+    # we still receive the updates (see below)
+    assert data_response.coin_states == []
+    # Farm more rewards to check the incoming queue for the updates
+    for i in range(0, num_blocks):
+        if i == num_blocks - 1:
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
+        else:
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
+    all_messages = await get_all_messages_in_queue(incoming_queue)
-        [tx_record] = await wallet.generate_signed_transaction(uint64(10), puzzle_hash, DEFAULT_TX_CONFIG, uint64(0))
-        assert len(tx_record.spend_bundle.removals()) == 1
-        spent_coin = tx_record.spend_bundle.removals()[0]
-        assert spent_coin.puzzle_hash == puzzle_hash
+    zero_coin = await full_node_api.full_node.coin_store.get_coin_states_by_puzzle_hashes(True, {zero_ph})
+    all_zero_coin = set(zero_coin)
+    notified_zero_coins = set()
-        await wallet_node.wallet_state_manager.add_pending_transactions([tx_record])
+    for message in all_messages:
+        if message.type == ProtocolMessageTypes.coin_state_update.value:
+            data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
+            for coin_state in data_response.items:
+                notified_zero_coins.add(coin_state)
+            assert len(data_response.items) == 2  # 2 per height farmer / pool reward
-        await full_node_api.process_transaction_records(records=[tx_record])
+    assert all_zero_coin == notified_zero_coins
-        # Let's make sure the wallet can handle a non ephemeral launcher
-        from chia.wallet.puzzles.singleton_top_layer import SINGLETON_LAUNCHER_HASH
+    # Test subscribing to more coins
+    one_ph = 32 * b"\1"
+    msg = wallet_protocol.RegisterForPhUpdates([one_ph], 0)
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
+    peak = full_node_api.full_node.blockchain.get_peak()
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
+    for i in range(0, num_blocks):
+        if i == num_blocks - 1:
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
+        else:
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
-        [tx_record] = await wallet.generate_signed_transaction(
-            uint64(10), SINGLETON_LAUNCHER_HASH, DEFAULT_TX_CONFIG, uint64(0)
-        )
-        await wallet_node.wallet_state_manager.add_pending_transactions([tx_record])
+    for i in range(0, num_blocks):
+        if i == num_blocks - 1:
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(one_ph))
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
+        else:
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(one_ph))
-        await full_node_api.process_transaction_records(records=[tx_record])
+    zero_coins = await full_node_api.full_node.coin_store.get_coin_states_by_puzzle_hashes(
+        True, {zero_ph}, peak.height + 1
+    )
+    one_coins = await full_node_api.full_node.coin_store.get_coin_states_by_puzzle_hashes(True, {one_ph})
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
+    all_coins = set(zero_coins)
+    all_coins.update(one_coins)
-        # Send a transaction to make sure the wallet is still running
-        [tx_record] = await wallet.generate_signed_transaction(uint64(10), junk_ph, DEFAULT_TX_CONFIG, uint64(0))
-        await wallet_node.wallet_state_manager.add_pending_transactions([tx_record])
+    all_messages = await get_all_messages_in_queue(incoming_queue)
-        await full_node_api.process_transaction_records(records=[tx_record])
+    notified_all_coins = set()
-        all_messages = await get_all_messages_in_queue(incoming_queue)
+    for message in all_messages:
+        if message.type == ProtocolMessageTypes.coin_state_update.value:
+            data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
+            for coin_state in data_response.items:
+                notified_all_coins.add(coin_state)
+            assert len(data_response.items) == 2  # 2 per height farmer / pool reward
-        notified_state = None
+    assert all_coins == notified_all_coins
-        for message in all_messages:
-            if message.type == ProtocolMessageTypes.coin_state_update.value:
-                data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
-                for coin_state in data_response.items:
-                    if coin_state.coin.name() == spent_coin.name():
-                        notified_state = coin_state
+    wsm: WalletStateManager = wallet_node.wallet_state_manager
+    wallet: Wallet = wsm.wallets[1]
+    puzzle_hash = await wallet.get_new_puzzlehash()
-        assert notified_state is not None
-        assert notified_state.coin == spent_coin
-        assert notified_state.spent_height is not None
-    @pytest.mark.anyio
-    async def test_subscribe_for_coin_id(self, simulator_and_wallet, self_hostname):
-        num_blocks = 4
-        full_nodes, wallets, _ = simulator_and_wallet
-        full_node_api = full_nodes[0]
-        wallet_node, server_2 = wallets[0]
-        fn_server = full_node_api.full_node.server
-        wsm: WalletStateManager = wallet_node.wallet_state_manager
-        standard_wallet: Wallet = wsm.wallets[1]
-        puzzle_hash = await standard_wallet.get_new_puzzlehash()
-        await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
-        incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
-        fake_wallet_peer = fn_server.all_connections[peer_id]
-        # Farm to create a coin that we'll track
-        for i in range(0, num_blocks):
+    for i in range(0, num_blocks):
+        if i == num_blocks - 1:
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(puzzle_hash))
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(junk_ph))
+        else:
             await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(puzzle_hash))
-        funds = sum(
-            [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks)]
-        )
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks + 1)]
+    )
+    fn_amount = sum(
+        cr.coin.amount
+        for cr in await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(False, puzzle_hash)
+    )
-        await time_out_assert(20, standard_wallet.get_confirmed_balance, funds)
+    await time_out_assert(20, wallet.get_confirmed_balance, funds)
+    assert funds == fn_amount
-        my_coins: List[CoinRecord] = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(
-            True, puzzle_hash
-        )
-        coin_to_spend = my_coins[0].coin
+    msg_1 = wallet_protocol.RegisterForPhUpdates([puzzle_hash], 0)
+    msg_response_1 = await full_node_api.register_interest_in_puzzle_hash(msg_1, fake_wallet_peer)
+    assert msg_response_1.type == ProtocolMessageTypes.respond_to_ph_update.value
+    data_response_1: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response_1.data)
+    assert len(data_response_1.coin_states) == 2 * num_blocks  # 2 per height farmer / pool reward
-        msg = wallet_protocol.RegisterForCoinUpdates([coin_to_spend.name()], 0)
-        msg_response = await full_node_api.register_interest_in_coin(msg, fake_wallet_peer)
-        assert msg_response is not None
-        assert msg_response.type == ProtocolMessageTypes.respond_to_coin_update.value
-        data_response: RespondToCoinUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
-        assert data_response.coin_states[0].coin == coin_to_spend
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        coins = set()
-        coins.add(coin_to_spend)
-        [tx_record] = await standard_wallet.generate_signed_transaction(
-            uint64(10), puzzle_hash, DEFAULT_TX_CONFIG, uint64(0), coins=coins
-        )
-        await standard_wallet.wallet_state_manager.add_pending_transactions([tx_record])
+    [tx_record] = await wallet.generate_signed_transaction(uint64(10), puzzle_hash, DEFAULT_TX_CONFIG, uint64(0))
+    assert len(tx_record.spend_bundle.removals()) == 1
+    spent_coin = tx_record.spend_bundle.removals()[0]
+    assert spent_coin.puzzle_hash == puzzle_hash
-        await full_node_api.process_transaction_records(records=[tx_record])
+    await wallet_node.wallet_state_manager.add_pending_transactions([tx_record])
-        all_messages = await get_all_messages_in_queue(incoming_queue)
+    await full_node_api.process_transaction_records(records=[tx_record])
-        notified_coins = set()
-        for message in all_messages:
-            if message.type == ProtocolMessageTypes.coin_state_update.value:
-                data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
-                for coin_state in data_response.items:
-                    notified_coins.add(coin_state.coin)
-                    assert coin_state.spent_height is not None
+    # Let's make sure the wallet can handle a non ephemeral launcher
+    from chia.wallet.puzzles.singleton_top_layer import SINGLETON_LAUNCHER_HASH
-        assert notified_coins == coins
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        # Test getting notification for coin that is about to be created
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
+    [tx_record] = await wallet.generate_signed_transaction(
+        uint64(10), SINGLETON_LAUNCHER_HASH, DEFAULT_TX_CONFIG, uint64(0)
+    )
+    await wallet_node.wallet_state_manager.add_pending_transactions([tx_record])
-        [tx_record] = await standard_wallet.generate_signed_transaction(
-            uint64(10), puzzle_hash, DEFAULT_TX_CONFIG, uint64(0)
-        )
+    await full_node_api.process_transaction_records(records=[tx_record])
-        tx_record.spend_bundle.additions()
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        added_target: Optional[Coin] = None
-        for coin in tx_record.spend_bundle.additions():
-            if coin.puzzle_hash == puzzle_hash:
-                added_target = coin
+    # Send a transaction to make sure the wallet is still running
+    [tx_record] = await wallet.generate_signed_transaction(uint64(10), junk_ph, DEFAULT_TX_CONFIG, uint64(0))
+    await wallet_node.wallet_state_manager.add_pending_transactions([tx_record])
-        assert added_target is not None
+    await full_node_api.process_transaction_records(records=[tx_record])
-        msg = wallet_protocol.RegisterForCoinUpdates([added_target.name()], 0)
-        msg_response = await full_node_api.register_interest_in_coin(msg, fake_wallet_peer)
-        assert msg_response is not None
-        assert msg_response.type == ProtocolMessageTypes.respond_to_coin_update.value
-        data_response: RespondToCoinUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
-        assert len(data_response.coin_states) == 0
+    all_messages = await get_all_messages_in_queue(incoming_queue)
-        await standard_wallet.wallet_state_manager.add_pending_transactions([tx_record])
+    notified_state = None
-        await full_node_api.process_transaction_records(records=[tx_record])
+    for message in all_messages:
+        if message.type == ProtocolMessageTypes.coin_state_update.value:
+            data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
+            for coin_state in data_response.items:
+                if coin_state.coin.name() == spent_coin.name():
+                    notified_state = coin_state
-        all_messages = await get_all_messages_in_queue(incoming_queue)
+    assert notified_state is not None
+    assert notified_state.coin == spent_coin
+    assert notified_state.spent_height is not None
-        notified_state = None
-        for message in all_messages:
-            if message.type == ProtocolMessageTypes.coin_state_update.value:
-                data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
-                for coin_state in data_response.items:
-                    if coin_state.coin.name() == added_target.name():
-                        notified_state = coin_state
+@pytest.mark.anyio
+async def test_subscribe_for_coin_id(simulator_and_wallet, self_hostname):
+    num_blocks = 4
+    full_nodes, wallets, _ = simulator_and_wallet
+    full_node_api = full_nodes[0]
+    wallet_node, server_2 = wallets[0]
+    fn_server = full_node_api.full_node.server
+    wsm: WalletStateManager = wallet_node.wallet_state_manager
+    standard_wallet: Wallet = wsm.wallets[1]
+    puzzle_hash = await standard_wallet.get_new_puzzlehash()
-        assert notified_state is not None
-        assert notified_state.coin == added_target
-        assert notified_state.spent_height is None
-    @pytest.mark.anyio
-    async def test_subscribe_for_ph_reorg(self, simulator_and_wallet, self_hostname):
-        num_blocks = 4
-        long_blocks = 20
-        full_nodes, wallets, _ = simulator_and_wallet
-        full_node_api = full_nodes[0]
-        wallet_node, server_2 = wallets[0]
-        fn_server = full_node_api.full_node.server
-        wsm: WalletStateManager = wallet_node.wallet_state_manager
-        standard_wallet: Wallet = wsm.wallets[1]
-        puzzle_hash = await standard_wallet.get_new_puzzlehash()
-        await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
-        incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
-        fake_wallet_peer = fn_server.all_connections[peer_id]
-        zero_ph = 32 * b"\0"
-        # Farm to create a coin that we'll track
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
+    incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
-        for i in range(0, long_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    fake_wallet_peer = fn_server.all_connections[peer_id]
-        msg = wallet_protocol.RegisterForPhUpdates([puzzle_hash], 0)
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
-        assert msg_response is not None
+    # Farm to create a coin that we'll track
+    for i in range(0, num_blocks):
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(puzzle_hash))
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks)]
+    )
-        expected_height = uint32(long_blocks + 2 * num_blocks + 1)
-        await time_out_assert(20, full_node_api.full_node.blockchain.get_peak_height, expected_height)
+    await time_out_assert(20, standard_wallet.get_confirmed_balance, funds)
-        coin_records = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(True, puzzle_hash)
-        assert len(coin_records) > 0
-        fork_height = expected_height - num_blocks - 5
-        req = ReorgProtocol(fork_height, expected_height + 5, zero_ph, None)
-        await full_node_api.reorg_from_index_to_new_index(req)
+    my_coins: List[CoinRecord] = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(
+        True, puzzle_hash
+    )
+    coin_to_spend = my_coins[0].coin
-        coin_records = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(True, puzzle_hash)
-        assert coin_records == []
+    msg = wallet_protocol.RegisterForCoinUpdates([coin_to_spend.name()], 0)
+    msg_response = await full_node_api.register_interest_in_coin(msg, fake_wallet_peer)
+    assert msg_response is not None
+    assert msg_response.type == ProtocolMessageTypes.respond_to_coin_update.value
+    data_response: RespondToCoinUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
+    assert data_response.coin_states[0].coin == coin_to_spend
-        all_messages = await get_all_messages_in_queue(incoming_queue)
+    coins = set()
+    coins.add(coin_to_spend)
+    [tx_record] = await standard_wallet.generate_signed_transaction(
+        uint64(10), puzzle_hash, DEFAULT_TX_CONFIG, uint64(0), coins=coins
+    )
+    await standard_wallet.wallet_state_manager.add_pending_transactions([tx_record])
-        coin_update_messages = []
-        for message in all_messages:
-            if message.type == ProtocolMessageTypes.coin_state_update.value:
-                data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
-                coin_update_messages.append(data_response)
-        # First state is creation, second one is a reorg
-        assert len(coin_update_messages) == 2
-        first = coin_update_messages[0]
-        assert len(first.items) == 2
-        first_state_coin_1 = first.items[0]
-        assert first_state_coin_1.spent_height is None
-        assert first_state_coin_1.created_height is not None
-        first_state_coin_2 = first.items[1]
-        assert first_state_coin_2.spent_height is None
-        assert first_state_coin_2.created_height is not None
-        second = coin_update_messages[1]
-        assert second.fork_height == fork_height
-        assert len(second.items) == 2
-        second_state_coin_1 = second.items[0]
-        assert second_state_coin_1.spent_height is None
-        assert second_state_coin_1.created_height is None
-        second_state_coin_2 = second.items[1]
-        assert second_state_coin_2.spent_height is None
-        assert second_state_coin_2.created_height is None
-    @pytest.mark.anyio
-    async def test_subscribe_for_coin_id_reorg(self, simulator_and_wallet, self_hostname):
-        num_blocks = 4
-        long_blocks = 20
-        full_nodes, wallets, _ = simulator_and_wallet
-        full_node_api = full_nodes[0]
-        wallet_node, server_2 = wallets[0]
-        fn_server = full_node_api.full_node.server
-        wsm: WalletStateManager = wallet_node.wallet_state_manager
-        standard_wallet: Wallet = wsm.wallets[1]
-        puzzle_hash = await standard_wallet.get_new_puzzlehash()
-        await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
-        incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
-        fake_wallet_peer = fn_server.all_connections[peer_id]
-        zero_ph = 32 * b"\0"
-        # Farm to create a coin that we'll track
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    await full_node_api.process_transaction_records(records=[tx_record])
-        for i in range(0, long_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    all_messages = await get_all_messages_in_queue(incoming_queue)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(puzzle_hash))
+    notified_coins = set()
+    for message in all_messages:
+        if message.type == ProtocolMessageTypes.coin_state_update.value:
+            data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
+            for coin_state in data_response.items:
+                notified_coins.add(coin_state.coin)
+                assert coin_state.spent_height is not None
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    assert notified_coins == coins
-        expected_height = uint32(long_blocks + 2 * num_blocks + 1)
-        await time_out_assert(20, full_node_api.full_node.blockchain.get_peak_height, expected_height)
+    # Test getting notification for coin that is about to be created
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        coin_records = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(True, puzzle_hash)
-        assert len(coin_records) > 0
+    [tx_record] = await standard_wallet.generate_signed_transaction(
+        uint64(10), puzzle_hash, DEFAULT_TX_CONFIG, uint64(0)
+    )
-        for coin_rec in coin_records:
-            msg = wallet_protocol.RegisterForCoinUpdates([coin_rec.name], 0)
-            msg_response = await full_node_api.register_interest_in_coin(msg, fake_wallet_peer)
-            assert msg_response is not None
+    added_target: Optional[Coin] = None
+    for coin in tx_record.spend_bundle.additions():
+        if coin.puzzle_hash == puzzle_hash:
+            added_target = coin
+    assert added_target is not None
+    msg = wallet_protocol.RegisterForCoinUpdates([added_target.name()], 0)
+    msg_response = await full_node_api.register_interest_in_coin(msg, fake_wallet_peer)
+    assert msg_response is not None
+    assert msg_response.type == ProtocolMessageTypes.respond_to_coin_update.value
+    data_response: RespondToCoinUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
+    assert len(data_response.coin_states) == 0
+    await standard_wallet.wallet_state_manager.add_pending_transactions([tx_record])
+    await full_node_api.process_transaction_records(records=[tx_record])
+    all_messages = await get_all_messages_in_queue(incoming_queue)
+    notified_state = None
+    for message in all_messages:
+        if message.type == ProtocolMessageTypes.coin_state_update.value:
+            data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
+            for coin_state in data_response.items:
+                if coin_state.coin.name() == added_target.name():
+                    notified_state = coin_state
+    assert notified_state is not None
+    assert notified_state.coin == added_target
+    assert notified_state.spent_height is None
+@pytest.mark.anyio
+async def test_subscribe_for_ph_reorg(simulator_and_wallet, self_hostname):
+    num_blocks = 4
+    long_blocks = 20
+    full_nodes, wallets, _ = simulator_and_wallet
+    full_node_api = full_nodes[0]
+    wallet_node, server_2 = wallets[0]
+    fn_server = full_node_api.full_node.server
+    wsm: WalletStateManager = wallet_node.wallet_state_manager
+    standard_wallet: Wallet = wsm.wallets[1]
+    puzzle_hash = await standard_wallet.get_new_puzzlehash()
+    await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
+    incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
+    fake_wallet_peer = fn_server.all_connections[peer_id]
+    # Farm to create a coin that we'll track
+    for i in range(0, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    for i in range(0, long_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    msg = wallet_protocol.RegisterForPhUpdates([puzzle_hash], 0)
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
+    assert msg_response is not None
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(puzzle_hash))
+    for i in range(0, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    expected_height = uint32(long_blocks + 2 * num_blocks + 1)
+    await time_out_assert(20, full_node_api.full_node.blockchain.get_peak_height, expected_height)
+    coin_records = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(True, puzzle_hash)
+    assert len(coin_records) > 0
+    fork_height = expected_height - num_blocks - 5
+    req = ReorgProtocol(fork_height, expected_height + 5, zero_ph, None)
+    await full_node_api.reorg_from_index_to_new_index(req)
+    coin_records = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(True, puzzle_hash)
+    assert coin_records == []
-        fork_height = expected_height - num_blocks - 5
-        req = ReorgProtocol(fork_height, expected_height + 5, zero_ph, None)
-        await full_node_api.reorg_from_index_to_new_index(req)
+    all_messages = await get_all_messages_in_queue(incoming_queue)
-        coin_records = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(True, puzzle_hash)
-        assert coin_records == []
+    coin_update_messages = []
+    for message in all_messages:
+        if message.type == ProtocolMessageTypes.coin_state_update.value:
+            data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
+            coin_update_messages.append(data_response)
+    # First state is creation, second one is a reorg
+    assert len(coin_update_messages) == 2
+    first = coin_update_messages[0]
-        all_messages = await get_all_messages_in_queue(incoming_queue)
+    assert len(first.items) == 2
+    first_state_coin_1 = first.items[0]
+    assert first_state_coin_1.spent_height is None
+    assert first_state_coin_1.created_height is not None
+    first_state_coin_2 = first.items[1]
+    assert first_state_coin_2.spent_height is None
+    assert first_state_coin_2.created_height is not None
+    second = coin_update_messages[1]
+    assert second.fork_height == fork_height
+    assert len(second.items) == 2
+    second_state_coin_1 = second.items[0]
+    assert second_state_coin_1.spent_height is None
+    assert second_state_coin_1.created_height is None
+    second_state_coin_2 = second.items[1]
+    assert second_state_coin_2.spent_height is None
+    assert second_state_coin_2.created_height is None
+@pytest.mark.anyio
+async def test_subscribe_for_coin_id_reorg(simulator_and_wallet, self_hostname):
+    num_blocks = 4
+    long_blocks = 20
+    full_nodes, wallets, _ = simulator_and_wallet
+    full_node_api = full_nodes[0]
+    wallet_node, server_2 = wallets[0]
+    fn_server = full_node_api.full_node.server
+    wsm: WalletStateManager = wallet_node.wallet_state_manager
+    standard_wallet: Wallet = wsm.wallets[1]
+    puzzle_hash = await standard_wallet.get_new_puzzlehash()
+    await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
+    incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
+    fake_wallet_peer = fn_server.all_connections[peer_id]
+    # Farm to create a coin that we'll track
+    for i in range(0, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    for i in range(0, long_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(puzzle_hash))
+    for i in range(0, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(zero_ph))
+    expected_height = uint32(long_blocks + 2 * num_blocks + 1)
+    await time_out_assert(20, full_node_api.full_node.blockchain.get_peak_height, expected_height)
+    coin_records = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(True, puzzle_hash)
+    assert len(coin_records) > 0
-        coin_update_messages = []
-        for message in all_messages:
-            if message.type == ProtocolMessageTypes.coin_state_update.value:
-                data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
-                coin_update_messages.append(data_response)
-        assert len(coin_update_messages) == 1
-        update = coin_update_messages[0]
-        coin_states = update.items
-        assert len(coin_states) == 2
-        first_coin = coin_states[0]
-        assert first_coin.spent_height is None
-        assert first_coin.created_height is None
-        second_coin = coin_states[1]
-        assert second_coin.spent_height is None
-        assert second_coin.created_height is None
-    @pytest.mark.anyio
-    async def test_subscribe_for_hint(self, simulator_and_wallet, self_hostname):
-        num_blocks = 4
-        full_nodes, wallets, bt = simulator_and_wallet
-        full_node_api = full_nodes[0]
-        wallet_node, server_2 = wallets[0]
-        fn_server = full_node_api.full_node.server
-        wsm: WalletStateManager = wallet_node.wallet_state_manager
-        await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
-        incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
-        wt: WalletTool = bt.get_pool_wallet_tool()
-        ph = wt.get_new_puzzlehash()
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await asyncio.sleep(6)
-        coins = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hashes(False, [ph])
-        coin_spent = coins[0].coin
-        hint_puzzle_hash = 32 * b"\2"
-        amount = 1
-        amount_bin = int_to_bytes(1)
-        hint = 32 * b"\5"
-        fake_wallet_peer = fn_server.all_connections[peer_id]
-        msg = wallet_protocol.RegisterForPhUpdates([hint], 0)
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
-        data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
-        assert len(data_response.coin_states) == 0
-        condition_dict = {
-            ConditionOpcode.CREATE_COIN: [
-                ConditionWithArgs(ConditionOpcode.CREATE_COIN, [hint_puzzle_hash, amount_bin, hint])
-            ]
-        }
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        tx: SpendBundle = wt.generate_signed_transaction(
-            10,
-            wt.get_new_puzzlehash(),
-            coin_spent,
-            condition_dic=condition_dict,
-        )
-        await full_node_api.respond_transaction(RespondTransaction(tx), fake_wallet_peer)
-        await full_node_api.process_spend_bundles(bundles=[tx])
-        all_messages = await get_all_messages_in_queue(incoming_queue)
+    for coin_rec in coin_records:
+        msg = wallet_protocol.RegisterForCoinUpdates([coin_rec.name], 0)
+        msg_response = await full_node_api.register_interest_in_coin(msg, fake_wallet_peer)
+        assert msg_response is not None
+    fork_height = expected_height - num_blocks - 5
+    req = ReorgProtocol(fork_height, expected_height + 5, zero_ph, None)
+    await full_node_api.reorg_from_index_to_new_index(req)
+    coin_records = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hash(True, puzzle_hash)
+    assert coin_records == []
+    all_messages = await get_all_messages_in_queue(incoming_queue)
+    coin_update_messages = []
+    for message in all_messages:
+        if message.type == ProtocolMessageTypes.coin_state_update.value:
+            data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
+            coin_update_messages.append(data_response)
+    assert len(coin_update_messages) == 1
+    update = coin_update_messages[0]
+    coin_states = update.items
+    assert len(coin_states) == 2
+    first_coin = coin_states[0]
+    assert first_coin.spent_height is None
+    assert first_coin.created_height is None
+    second_coin = coin_states[1]
+    assert second_coin.spent_height is None
+    assert second_coin.created_height is None
+@pytest.mark.anyio
+async def test_subscribe_for_hint(simulator_and_wallet, self_hostname):
+    num_blocks = 4
+    full_nodes, wallets, bt = simulator_and_wallet
+    full_node_api = full_nodes[0]
+    wallet_node, server_2 = wallets[0]
+    fn_server = full_node_api.full_node.server
+    wsm: WalletStateManager = wallet_node.wallet_state_manager
+    await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
+    incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
+    wt: WalletTool = bt.get_pool_wallet_tool()
+    ph = wt.get_new_puzzlehash()
+    for i in range(0, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await asyncio.sleep(6)
+    coins = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hashes(False, [ph])
+    coin_spent = coins[0].coin
+    hint_puzzle_hash = 32 * b"\2"
+    amount = 1
+    amount_bin = int_to_bytes(1)
+    hint = 32 * b"\5"
+    fake_wallet_peer = fn_server.all_connections[peer_id]
+    msg = wallet_protocol.RegisterForPhUpdates([hint], 0)
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
+    assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
+    data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
+    assert len(data_response.coin_states) == 0
+    condition_dict = {
+        ConditionOpcode.CREATE_COIN: [
+            ConditionWithArgs(ConditionOpcode.CREATE_COIN, [hint_puzzle_hash, amount_bin, hint])
+        ]
+    }
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
+    tx: SpendBundle = wt.generate_signed_transaction(
+        10,
+        wt.get_new_puzzlehash(),
+        coin_spent,
+        condition_dic=condition_dict,
+    )
+    await full_node_api.respond_transaction(RespondTransaction(tx), fake_wallet_peer)
+    await full_node_api.process_spend_bundles(bundles=[tx])
+    all_messages = await get_all_messages_in_queue(incoming_queue)
+    notified_state = None
+    for message in all_messages:
+        if message.type == ProtocolMessageTypes.coin_state_update.value:
+            data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
+            notified_state = data_response
+            break
+    assert notified_state is not None
+    assert notified_state.items[0].coin == Coin(coin_spent.name(), hint_puzzle_hash, amount)
+    msg = wallet_protocol.RegisterForPhUpdates([hint], 0)
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
+    assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
+    data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
+    # we have already subscribed to this puzzle hash. The full node will
+    # ignore the duplicate
+    assert data_response.coin_states == []
+@pytest.mark.anyio
+async def test_subscribe_for_puzzle_hash_coin_hint_duplicates(
+    simulator_and_wallet: OldSimulatorsAndWallets, self_hostname: str
+) -> None:
+    [full_node_api], [[_, wallet_server]], bt = simulator_and_wallet
+    full_node_server = full_node_api.full_node.server
+    await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    wt: WalletTool = bt.get_pool_wallet_tool()
+    ph = wt.get_new_puzzlehash()
+    await full_node_api.farm_blocks_to_puzzlehash(4, ph)
+    coins = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hashes(False, [ph])
+    wallet_connection = full_node_server.all_connections[wallet_server.node_id]
+    # Create a coin which is hinted with its own destination puzzle hash
+    tx: SpendBundle = wt.generate_signed_transaction(
+        uint64(10),
+        wt.get_new_puzzlehash(),
+        coins[0].coin,
+        condition_dic={
+            ConditionOpcode.CREATE_COIN: [ConditionWithArgs(ConditionOpcode.CREATE_COIN, [ph, int_to_bytes(1), ph])]
+        },
+    )
+    await full_node_api.respond_transaction(RespondTransaction(tx), wallet_connection)
+    await full_node_api.process_spend_bundles(bundles=[tx])
+    # Query the coin states and make sure it doesn't contain duplicated entries
+    msg = wallet_protocol.RegisterForPhUpdates([ph], uint32(0))
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, wallet_connection)
+    assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
+    response = RespondToCoinUpdates.from_bytes(msg_response.data)
+    assert len(response.coin_states) > 0
+    assert len(set(response.coin_states)) == len(response.coin_states)
+@pytest.mark.anyio
+async def test_subscribe_for_hint_long_sync(wallet_two_node_simulator, self_hostname):
+    num_blocks = 4
+    full_nodes, wallets, bt = wallet_two_node_simulator
+    full_node_api = full_nodes[0]
+    full_node_api_1 = full_nodes[1]
+    wallet_node, server_2 = wallets[0]
+    fn_server = full_node_api.full_node.server
+    fn_server_1 = full_node_api_1.full_node.server
+    wsm: WalletStateManager = wallet_node.wallet_state_manager
+    await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
+    incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
+    incoming_queue_1, peer_id_1 = await add_dummy_connection(fn_server_1, self_hostname, 12313, NodeType.WALLET)
+    wt: WalletTool = bt.get_pool_wallet_tool()
+    ph = wt.get_new_puzzlehash()
+    for i in range(0, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await asyncio.sleep(6)
+    coins = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hashes(False, [ph])
+    coin_spent = coins[0].coin
+    hint_puzzle_hash = 32 * b"\2"
+    amount = 1
+    amount_bin = int_to_bytes(1)
+    hint = 32 * b"\5"
+    fake_wallet_peer = fn_server.all_connections[peer_id]
+    fake_wallet_peer_1 = fn_server_1.all_connections[peer_id_1]
+    msg = wallet_protocol.RegisterForPhUpdates([hint], 0)
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
+    msg_response_1 = await full_node_api_1.register_interest_in_puzzle_hash(msg, fake_wallet_peer_1)
+    assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
+    data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
+    assert len(data_response.coin_states) == 0
+    condition_dict = {
+        ConditionOpcode.CREATE_COIN: [
+            ConditionWithArgs(ConditionOpcode.CREATE_COIN, [hint_puzzle_hash, amount_bin, hint])
+        ]
+    }
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
+    tx: SpendBundle = wt.generate_signed_transaction(
+        10,
+        wt.get_new_puzzlehash(),
+        coin_spent,
+        condition_dic=condition_dict,
+    )
+    await full_node_api.respond_transaction(RespondTransaction(tx), fake_wallet_peer)
+    await full_node_api.process_spend_bundles(bundles=[tx])
+    # Create more blocks than recent "short_sync_blocks_behind_threshold" so that node enters batch
+    for i in range(0, 100):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    node1_height = full_node_api_1.full_node.blockchain.get_peak_height()
+    assert node1_height is None
+    await fn_server_1.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
+    node0_height = full_node_api.full_node.blockchain.get_peak_height()
+    await time_out_assert(60, full_node_api_1.full_node.blockchain.get_peak_height, node0_height)
+    all_messages = await get_all_messages_in_queue(incoming_queue)
+    all_messages_1 = await get_all_messages_in_queue(incoming_queue_1)
+    def check_messages_for_hint(messages):
         notified_state = None
-        for message in all_messages:
+        for message in messages:
             if message.type == ProtocolMessageTypes.coin_state_update.value:
                 data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
                 notified_state = data_response
         @@@ -535,210 -535,210 +652,87 @@@
         assert notified_state is not None
         assert notified_state.items[0].coin == Coin(coin_spent.name(), hint_puzzle_hash, amount)
-        msg = wallet_protocol.RegisterForPhUpdates([hint], 0)
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
-        data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
-        # we have already subscribed to this puzzle hash. The full node will
-        # ignore the duplicate
-        assert data_response.coin_states == []
-    @pytest.mark.anyio
-    async def test_subscribe_for_puzzle_hash_coin_hint_duplicates(
-        self, simulator_and_wallet: OldSimulatorsAndWallets, self_hostname: str
-    ) -> None:
-        [full_node_api], [[_, wallet_server]], bt = simulator_and_wallet
-        full_node_server = full_node_api.full_node.server
-        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        wt: WalletTool = bt.get_pool_wallet_tool()
-        ph = wt.get_new_puzzlehash()
-        await full_node_api.farm_blocks_to_puzzlehash(4, ph)
-        coins = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hashes(False, [ph])
-        wallet_connection = full_node_server.all_connections[wallet_server.node_id]
-        # Create a coin which is hinted with its own destination puzzle hash
-        tx: SpendBundle = wt.generate_signed_transaction(
-            uint64(10),
-            wt.get_new_puzzlehash(),
-            coins[0].coin,
-            condition_dic={
-                ConditionOpcode.CREATE_COIN: [ConditionWithArgs(ConditionOpcode.CREATE_COIN, [ph, int_to_bytes(1), ph])]
-            },
-        )
-        await full_node_api.respond_transaction(RespondTransaction(tx), wallet_connection)
-        await full_node_api.process_spend_bundles(bundles=[tx])
-        # Query the coin states and make sure it doesn't contain duplicated entries
-        msg = wallet_protocol.RegisterForPhUpdates([ph], uint32(0))
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, wallet_connection)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
-        response = RespondToCoinUpdates.from_bytes(msg_response.data)
-        assert len(response.coin_states) > 0
-        assert len(set(response.coin_states)) == len(response.coin_states)
-    @pytest.mark.anyio
-    async def test_subscribe_for_hint_long_sync(self, wallet_two_node_simulator, self_hostname):
-        num_blocks = 4
-        full_nodes, wallets, bt = wallet_two_node_simulator
-        full_node_api = full_nodes[0]
-        full_node_api_1 = full_nodes[1]
-        wallet_node, server_2 = wallets[0]
-        fn_server = full_node_api.full_node.server
-        fn_server_1 = full_node_api_1.full_node.server
-        wsm: WalletStateManager = wallet_node.wallet_state_manager
-        await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
-        incoming_queue, peer_id = await add_dummy_connection(fn_server, self_hostname, 12312, NodeType.WALLET)
-        incoming_queue_1, peer_id_1 = await add_dummy_connection(fn_server_1, self_hostname, 12313, NodeType.WALLET)
-        wt: WalletTool = bt.get_pool_wallet_tool()
-        ph = wt.get_new_puzzlehash()
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await asyncio.sleep(6)
-        coins = await full_node_api.full_node.coin_store.get_coin_records_by_puzzle_hashes(False, [ph])
-        coin_spent = coins[0].coin
-        hint_puzzle_hash = 32 * b"\2"
-        amount = 1
-        amount_bin = int_to_bytes(1)
-        hint = 32 * b"\5"
-        fake_wallet_peer = fn_server.all_connections[peer_id]
-        fake_wallet_peer_1 = fn_server_1.all_connections[peer_id_1]
-        msg = wallet_protocol.RegisterForPhUpdates([hint], 0)
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, fake_wallet_peer)
-        msg_response_1 = await full_node_api_1.register_interest_in_puzzle_hash(msg, fake_wallet_peer_1)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
-        data_response: RespondToPhUpdates = RespondToCoinUpdates.from_bytes(msg_response.data)
-        assert len(data_response.coin_states) == 0
-        condition_dict = {
-            ConditionOpcode.CREATE_COIN: [
-                ConditionWithArgs(ConditionOpcode.CREATE_COIN, [hint_puzzle_hash, amount_bin, hint])
-            ]
-        }
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        tx: SpendBundle = wt.generate_signed_transaction(
-            10,
-            wt.get_new_puzzlehash(),
-            coin_spent,
-            condition_dic=condition_dict,
-        )
-        await full_node_api.respond_transaction(RespondTransaction(tx), fake_wallet_peer)
-        await full_node_api.process_spend_bundles(bundles=[tx])
-        # Create more blocks than recent "short_sync_blocks_behind_threshold" so that node enters batch
-        for i in range(0, 100):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        node1_height = full_node_api_1.full_node.blockchain.get_peak_height()
-        assert node1_height is None
-        await fn_server_1.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
-        node0_height = full_node_api.full_node.blockchain.get_peak_height()
-        await time_out_assert(60, full_node_api_1.full_node.blockchain.get_peak_height, node0_height)
-        all_messages = await get_all_messages_in_queue(incoming_queue)
-        all_messages_1 = await get_all_messages_in_queue(incoming_queue_1)
-        def check_messages_for_hint(messages):
-            notified_state = None
-            for message in messages:
-                if message.type == ProtocolMessageTypes.coin_state_update.value:
-                    data_response: CoinStateUpdate = CoinStateUpdate.from_bytes(message.data)
-                    notified_state = data_response
-                    break
-            assert notified_state is not None
-            assert notified_state.items[0].coin == Coin(coin_spent.name(), hint_puzzle_hash, amount)
-        check_messages_for_hint(all_messages)
-        check_messages_for_hint(all_messages_1)
-    @pytest.mark.anyio
-    async def test_ph_subscribe_limits(self, simulator_and_wallet, self_hostname):
-        full_nodes, wallets, _ = simulator_and_wallet
-        full_node_api = full_nodes[0]
-        wallet_node, server_2 = wallets[0]
-        fn_server = full_node_api.full_node.server
-        await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
-        con = list(fn_server.all_connections.values())[0]
-        phs = []
-        phs.append(32 * b"\0")
-        phs.append(32 * b"\1")
-        phs.append(32 * b"\2")
-        phs.append(32 * b"\3")
-        phs.append(32 * b"\4")
-        phs.append(32 * b"\5")
-        phs.append(32 * b"\6")
-        full_node_api.full_node.config["max_subscribe_items"] = 2
-        assert full_node_api.is_trusted(con) is False
-        msg = wallet_protocol.RegisterForPhUpdates(phs, 0)
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, con)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
-        s = full_node_api.full_node.subscriptions
-        assert len(s._ph_subscriptions) == 2
-        assert s.has_ph_subscription(phs[0])
-        assert s.has_ph_subscription(phs[1])
-        assert not s.has_ph_subscription(phs[2])
-        assert not s.has_ph_subscription(phs[3])
-        full_node_api.full_node.config["trusted_max_subscribe_items"] = 4
-        full_node_api.full_node.config["trusted_peers"] = {server_2.node_id.hex(): server_2.node_id.hex()}
-        assert full_node_api.is_trusted(con) is True
-        msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, con)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
-        assert len(s._ph_subscriptions) == 4
-        assert s.has_ph_subscription(phs[0])
-        assert s.has_ph_subscription(phs[1])
-        assert s.has_ph_subscription(phs[2])
-        assert s.has_ph_subscription(phs[3])
-        assert not s.has_ph_subscription(phs[4])
-        assert not s.has_ph_subscription(phs[5])
-    @pytest.mark.anyio
-    async def test_coin_subscribe_limits(self, simulator_and_wallet, self_hostname):
-        full_nodes, wallets, _ = simulator_and_wallet
-        full_node_api = full_nodes[0]
-        wallet_node, server_2 = wallets[0]
-        fn_server = full_node_api.full_node.server
-        await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
-        con = list(fn_server.all_connections.values())[0]
-        coins = []
-        coins.append(32 * b"\0")
-        coins.append(32 * b"\1")
-        coins.append(32 * b"\2")
-        coins.append(32 * b"\3")
-        coins.append(32 * b"\4")
-        coins.append(32 * b"\5")
-        coins.append(32 * b"\6")
-        full_node_api.full_node.config["max_subscribe_items"] = 2
-        assert full_node_api.is_trusted(con) is False
-        msg = wallet_protocol.RegisterForCoinUpdates(coins, 0)
-        msg_response = await full_node_api.register_interest_in_coin(msg, con)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_coin_update.value
-        s = full_node_api.full_node.subscriptions
-        assert len(s._coin_subscriptions) == 2
-        assert s.has_coin_subscription(coins[0])
-        assert s.has_coin_subscription(coins[1])
-        assert not s.has_coin_subscription(coins[2])
-        assert not s.has_coin_subscription(coins[3])
-        full_node_api.full_node.config["trusted_max_subscribe_items"] = 4
-        full_node_api.full_node.config["trusted_peers"] = {server_2.node_id.hex(): server_2.node_id.hex()}
-        assert full_node_api.is_trusted(con) is True
-        msg_response = await full_node_api.register_interest_in_coin(msg, con)
-        assert msg_response.type == ProtocolMessageTypes.respond_to_coin_update.value
-        assert len(s._coin_subscriptions) == 4
-        assert s.has_coin_subscription(coins[0])
-        assert s.has_coin_subscription(coins[1])
-        assert s.has_coin_subscription(coins[2])
-        assert s.has_coin_subscription(coins[3])
-        assert not s.has_coin_subscription(coins[4])
-        assert not s.has_coin_subscription(coins[5])
+    check_messages_for_hint(all_messages)
+    check_messages_for_hint(all_messages_1)
+@pytest.mark.anyio
+async def test_ph_subscribe_limits(simulator_and_wallet, self_hostname):
+    full_nodes, wallets, _ = simulator_and_wallet
+    full_node_api = full_nodes[0]
+    wallet_node, server_2 = wallets[0]
+    fn_server = full_node_api.full_node.server
+    await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
+    con = list(fn_server.all_connections.values())[0]
+    phs = []
+    phs.append(32 * b"\0")
+    phs.append(32 * b"\1")
+    phs.append(32 * b"\2")
+    phs.append(32 * b"\3")
+    phs.append(32 * b"\4")
+    phs.append(32 * b"\5")
+    phs.append(32 * b"\6")
+    full_node_api.full_node.config["max_subscribe_items"] = 2
+    assert full_node_api.is_trusted(con) is False
+    msg = wallet_protocol.RegisterForPhUpdates(phs, 0)
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, con)
+    assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
+    s = full_node_api.full_node.subscriptions
+    assert s.puzzle_subscription_count() == 2
+    assert s.has_puzzle_subscription(phs[0])
+    assert s.has_puzzle_subscription(phs[1])
+    assert not s.has_puzzle_subscription(phs[2])
+    assert not s.has_puzzle_subscription(phs[3])
+    full_node_api.full_node.config["trusted_max_subscribe_items"] = 4
+    full_node_api.full_node.config["trusted_peers"] = {server_2.node_id.hex(): server_2.node_id.hex()}
+    assert full_node_api.is_trusted(con) is True
+    msg_response = await full_node_api.register_interest_in_puzzle_hash(msg, con)
+    assert msg_response.type == ProtocolMessageTypes.respond_to_ph_update.value
+    assert s.puzzle_subscription_count() == 4
+    assert s.has_puzzle_subscription(phs[0])
+    assert s.has_puzzle_subscription(phs[1])
+    assert s.has_puzzle_subscription(phs[2])
+    assert s.has_puzzle_subscription(phs[3])
+    assert not s.has_puzzle_subscription(phs[4])
+    assert not s.has_puzzle_subscription(phs[5])
+@pytest.mark.anyio
+async def test_coin_subscribe_limits(simulator_and_wallet, self_hostname):
+    full_nodes, wallets, _ = simulator_and_wallet
+    full_node_api = full_nodes[0]
+    wallet_node, server_2 = wallets[0]
+    fn_server = full_node_api.full_node.server
+    await server_2.start_client(PeerInfo(self_hostname, fn_server.get_port()), None)
+    con = list(fn_server.all_connections.values())[0]
+    coins = []
+    coins.append(32 * b"\0")
+    coins.append(32 * b"\1")
+    coins.append(32 * b"\2")
+    coins.append(32 * b"\3")
+    coins.append(32 * b"\4")
+    coins.append(32 * b"\5")
+    coins.append(32 * b"\6")
+    full_node_api.full_node.config["max_subscribe_items"] = 2
+    assert full_node_api.is_trusted(con) is False
+    msg = wallet_protocol.RegisterForCoinUpdates(coins, 0)
+    msg_response = await full_node_api.register_interest_in_coin(msg, con)
+    assert msg_response.type == ProtocolMessageTypes.respond_to_coin_update.value
+    s = full_node_api.full_node.subscriptions
+    assert s.coin_subscription_count() == 2
+    assert s.has_coin_subscription(coins[0])
+    assert s.has_coin_subscription(coins[1])
+    assert not s.has_coin_subscription(coins[2])
+    assert not s.has_coin_subscription(coins[3])
+    full_node_api.full_node.config["trusted_max_subscribe_items"] = 4
+    full_node_api.full_node.config["trusted_peers"] = {server_2.node_id.hex(): server_2.node_id.hex()}
+    assert full_node_api.is_trusted(con) is True
+    msg_response = await full_node_api.register_interest_in_coin(msg, con)
+    assert msg_response.type == ProtocolMessageTypes.respond_to_coin_update.value
+    assert s.coin_subscription_count() == 4
+    assert s.has_coin_subscription(coins[0])
+    assert s.has_coin_subscription(coins[1])
+    assert s.has_coin_subscription(coins[2])
+    assert s.has_coin_subscription(coins[3])
+    assert not s.has_coin_subscription(coins[4])
+    assert not s.has_coin_subscription(coins[5])

tests/wallet/sync/test_wallet_sync.py CHANGED Viewed

         @@@ -31,17 -31,17 +31,17 @@@ from chia.wallet.util.compute_memos imp
 from chia.wallet.util.tx_config import DEFAULT_COIN_SELECTION_CONFIG, DEFAULT_TX_CONFIG
 from chia.wallet.util.wallet_sync_utils import PeerRequestException
 from chia.wallet.wallet_coin_record import WalletCoinRecord
+from chia.wallet.wallet_state_manager import WalletStateManager
 from chia.wallet.wallet_weight_proof_handler import get_wp_fork_point
 from tests.connection_utils import disconnect_all, disconnect_all_and_reconnect
+from tests.util.misc import wallet_height_at_least
 from tests.util.time_out_assert import time_out_assert, time_out_assert_not_none
 from tests.weight_proof.test_weight_proof import load_blocks_dont_validate
-async def wallet_height_at_least(wallet_node, h):
-    height = await wallet_node.wallet_state_manager.blockchain.get_finished_sync_up_to()
-    if height == h:
-        return True
-    return False
+async def get_tx_count(wsm: WalletStateManager, wallet_id: int) -> int:
+    txs = await wsm.get_all_transactions(wallet_id)
+    return len(txs)
 async def get_nft_count(wallet: NFTWallet) -> int:
         @@@ -51,758 -51,758 +51,713 @@@
 log = getLogger(__name__)
-class TestWalletSync:
-    @pytest.mark.limit_consensus_modes(reason="save time")
-    @pytest.mark.anyio
-    async def test_request_block_headers(self, simulator_and_wallet, default_1000_blocks):
-        # Tests the edge case of receiving funds right before the recent blocks  in weight proof
-        [full_node_api], [(wallet_node, _)], bt = simulator_and_wallet
+@pytest.mark.limit_consensus_modes(reason="save time")
+@pytest.mark.anyio
+async def test_request_block_headers(simulator_and_wallet, default_1000_blocks):
+    # Tests the edge case of receiving funds right before the recent blocks  in weight proof
+    [full_node_api], [(wallet_node, _)], bt = simulator_and_wallet
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
+    for block in default_1000_blocks[:100]:
+        await full_node_api.full_node.add_block(block)
+    msg = await full_node_api.request_block_headers(wallet_protocol.RequestBlockHeaders(uint32(10), uint32(15), False))
+    assert msg.type == ProtocolMessageTypes.respond_block_headers.value
+    res_block_headers = RespondBlockHeaders.from_bytes(msg.data)
+    bh = res_block_headers.header_blocks
+    assert len(bh) == 6
+    assert [x.reward_chain_block.height for x in default_1000_blocks[10:16]] == [
+        x.reward_chain_block.height for x in bh
+    ]
+    assert [x.foliage for x in default_1000_blocks[10:16]] == [x.foliage for x in bh]
+    assert [x.transactions_filter for x in bh] == [b"\x00"] * 6
+    num_blocks = 20
+    new_blocks = bt.get_consecutive_blocks(num_blocks, block_list_input=default_1000_blocks, pool_reward_puzzle_hash=ph)
+    for i in range(0, len(new_blocks)):
+        await full_node_api.full_node.add_block(new_blocks[i])
+    msg = await full_node_api.request_block_headers(wallet_protocol.RequestBlockHeaders(uint32(110), uint32(115), True))
+    res_block_headers = RespondBlockHeaders.from_bytes(msg.data)
+    bh = res_block_headers.header_blocks
+    assert len(bh) == 6
+# @pytest.mark.parametrize(
+#     "test_case",
+#     [(1000000, 10000010, False, ProtocolMessageTypes.reject_block_headers)],
+#     [(80, 99, False, ProtocolMessageTypes.respond_block_headers)],
+#     [(10, 8, False, None)],
+# )
+@pytest.mark.anyio
+async def test_request_block_headers_rejected(simulator_and_wallet, default_1000_blocks):
+    # Tests the edge case of receiving funds right before the recent blocks  in weight proof
+    [full_node_api], _, bt = simulator_and_wallet
+    # start_height, end_height, return_filter, expected_res = test_case
+    msg = await full_node_api.request_block_headers(
+        wallet_protocol.RequestBlockHeaders(uint32(1000000), uint32(1000010), False)
+    )
+    assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+    for block in default_1000_blocks[:150]:
+        await full_node_api.full_node.add_block(block)
+    msg = await full_node_api.request_block_headers(wallet_protocol.RequestBlockHeaders(uint32(80), uint32(99), False))
+    assert msg.type == ProtocolMessageTypes.respond_block_headers.value
+    msg = await full_node_api.request_block_headers(wallet_protocol.RequestBlockHeaders(uint32(10), uint32(8), False))
+    assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+    msg = await full_node_api.request_block_headers(wallet_protocol.RequestBlockHeaders(uint32(10), uint32(8), True))
+    assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+    # test for 128 blocks to fetch at once limit
+    msg = await full_node_api.request_block_headers(wallet_protocol.RequestBlockHeaders(uint32(10), uint32(140), True))
+    assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+    msg = await full_node_api.request_block_headers(wallet_protocol.RequestBlockHeaders(uint32(90), uint32(160), False))
+    assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+    msg = await full_node_api.request_block_headers(wallet_protocol.RequestBlockHeaders(uint32(90), uint32(160), True))
+    assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+@pytest.mark.parametrize(
+    "two_wallet_nodes",
+    [
+        dict(
+            disable_capabilities=[Capability.BLOCK_HEADERS],
+        ),
+        dict(
+            disable_capabilities=[Capability.BASE],
+        ),
+    ],
+    indirect=True,
+)
+@pytest.mark.limit_consensus_modes(reason="save time")
+@pytest.mark.anyio
+async def test_basic_sync_wallet(two_wallet_nodes, default_400_blocks, self_hostname):
+    full_nodes, wallets, bt = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
+    # Trusted node sync
+    wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    # Untrusted node sync
+    wallets[1][0].config["trusted_peers"] = {}
+    for block in default_400_blocks:
+        await full_node_api.full_node.add_block(block)
+    for wallet_node, wallet_server in wallets:
+        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
-        for block in default_1000_blocks[:100]:
-            await full_node_api.full_node.add_block(block)
+    for wallet_node, wallet_server in wallets:
+        await time_out_assert(100, wallet_height_at_least, True, wallet_node, len(default_400_blocks) - 1)
-        msg = await full_node_api.request_block_headers(
-            wallet_protocol.RequestBlockHeaders(uint32(10), uint32(15), False)
+    # Tests a reorg with the wallet
+    num_blocks = 30
+    blocks_reorg = bt.get_consecutive_blocks(num_blocks - 1, block_list_input=default_400_blocks[:-5])
+    blocks_reorg = bt.get_consecutive_blocks(1, blocks_reorg, guarantee_transaction_block=True, current_time=True)
+    for i in range(1, len(blocks_reorg)):
+        await full_node_api.full_node.add_block(blocks_reorg[i])
+    for wallet_node, wallet_server in wallets:
+        await disconnect_all_and_reconnect(wallet_server, full_node_server, self_hostname)
+    for wallet_node, wallet_server in wallets:
+        await time_out_assert(
+            100, wallet_height_at_least, True, wallet_node, len(default_400_blocks) + num_blocks - 5 - 1
         )
-        assert msg.type == ProtocolMessageTypes.respond_block_headers.value
-        res_block_headers = RespondBlockHeaders.from_bytes(msg.data)
-        bh = res_block_headers.header_blocks
-        assert len(bh) == 6
-        assert [x.reward_chain_block.height for x in default_1000_blocks[10:16]] == [
-            x.reward_chain_block.height for x in bh
-        ]
-        assert [x.foliage for x in default_1000_blocks[10:16]] == [x.foliage for x in bh]
+        await time_out_assert(20, wallet_node.wallet_state_manager.synced)
+        await disconnect_all(wallet_server)
+        assert not (await wallet_node.wallet_state_manager.synced())
+@pytest.mark.parametrize(
+    "two_wallet_nodes",
+    [
+        dict(
+            disable_capabilities=[Capability.BLOCK_HEADERS],
+        ),
+        dict(
+            disable_capabilities=[Capability.BASE],
+        ),
+    ],
+    indirect=True,
+)
+@pytest.mark.limit_consensus_modes(reason="save time")
+@pytest.mark.anyio
+async def test_almost_recent(two_wallet_nodes, default_400_blocks, self_hostname, blockchain_constants):
+    # Tests the edge case of receiving funds right before the recent blocks  in weight proof
+    full_nodes, wallets, bt = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
+    # Trusted node sync
+    wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    # Untrusted node sync
+    wallets[1][0].config["trusted_peers"] = {}
+    base_num_blocks = 400
+    for block in default_400_blocks:
+        await full_node_api.full_node.add_block(block)
+    all_blocks = default_400_blocks
+    both_phs = []
+    for wallet_node, wallet_server in wallets:
+        wallet = wallet_node.wallet_state_manager.main_wallet
+        both_phs.append(await wallet.get_new_puzzlehash())
-        assert [x.transactions_filter for x in bh] == [b"\x00"] * 6
+    for i in range(20):
+        # Tests a reorg with the wallet
+        ph = both_phs[i % 2]
+        all_blocks = bt.get_consecutive_blocks(1, block_list_input=all_blocks, pool_reward_puzzle_hash=ph)
+        await full_node_api.full_node.add_block(all_blocks[-1])
-        num_blocks = 20
-        new_blocks = bt.get_consecutive_blocks(
-            num_blocks, block_list_input=default_1000_blocks, pool_reward_puzzle_hash=ph
-        )
-        for i in range(0, len(new_blocks)):
-            await full_node_api.full_node.add_block(new_blocks[i])
+    new_blocks = bt.get_consecutive_blocks(
+        blockchain_constants.WEIGHT_PROOF_RECENT_BLOCKS + 10, block_list_input=all_blocks
+    )
+    for i in range(base_num_blocks + 20, len(new_blocks)):
+        await full_node_api.full_node.add_block(new_blocks[i])
-        msg = await full_node_api.request_block_headers(
-            wallet_protocol.RequestBlockHeaders(uint32(110), uint32(115), True)
-        )
-        res_block_headers = RespondBlockHeaders.from_bytes(msg.data)
-        bh = res_block_headers.header_blocks
-        assert len(bh) == 6
-    # @pytest.mark.parametrize(
-    #     "test_case",
-    #     [(1000000, 10000010, False, ProtocolMessageTypes.reject_block_headers)],
-    #     [(80, 99, False, ProtocolMessageTypes.respond_block_headers)],
-    #     [(10, 8, False, None)],
-    # )
-    @pytest.mark.anyio
-    async def test_request_block_headers_rejected(self, simulator_and_wallet, default_1000_blocks):
-        # Tests the edge case of receiving funds right before the recent blocks  in weight proof
-        [full_node_api], _, bt = simulator_and_wallet
-        # start_height, end_height, return_filter, expected_res = test_case
-        msg = await full_node_api.request_block_headers(
-            wallet_protocol.RequestBlockHeaders(uint32(1000000), uint32(1000010), False)
-        )
-        assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+    for wallet_node, wallet_server in wallets:
+        wallet = wallet_node.wallet_state_manager.main_wallet
+        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+        await time_out_assert(30, wallet.get_confirmed_balance, 10 * calculate_pool_reward(uint32(1000)))
-        for block in default_1000_blocks[:150]:
-            await full_node_api.full_node.add_block(block)
-        msg = await full_node_api.request_block_headers(
-            wallet_protocol.RequestBlockHeaders(uint32(80), uint32(99), False)
-        )
-        assert msg.type == ProtocolMessageTypes.respond_block_headers.value
-        msg = await full_node_api.request_block_headers(
-            wallet_protocol.RequestBlockHeaders(uint32(10), uint32(8), False)
-        )
-        assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+@pytest.mark.anyio
+async def test_backtrack_sync_wallet(two_wallet_nodes, default_400_blocks, self_hostname):
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
-        msg = await full_node_api.request_block_headers(
-            wallet_protocol.RequestBlockHeaders(uint32(10), uint32(8), True)
-        )
-        assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+    # Trusted node sync
+    wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        # test for 128 blocks to fetch at once limit
-        msg = await full_node_api.request_block_headers(
-            wallet_protocol.RequestBlockHeaders(uint32(10), uint32(140), True)
-        )
-        assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+    # Untrusted node sync
+    wallets[1][0].config["trusted_peers"] = {}
-        msg = await full_node_api.request_block_headers(
-            wallet_protocol.RequestBlockHeaders(uint32(90), uint32(160), False)
-        )
-        assert msg.type == ProtocolMessageTypes.reject_block_headers.value
-        msg = await full_node_api.request_block_headers(
-            wallet_protocol.RequestBlockHeaders(uint32(90), uint32(160), True)
-        )
-        assert msg.type == ProtocolMessageTypes.reject_block_headers.value
+    for block in default_400_blocks[:20]:
+        await full_node_api.full_node.add_block(block)
-    @pytest.mark.parametrize(
-        "two_wallet_nodes",
-        [
-            dict(
-                disable_capabilities=[Capability.BLOCK_HEADERS],
-            ),
-            dict(
-                disable_capabilities=[Capability.BASE],
-            ),
-        ],
-        indirect=True,
-    )
-    @pytest.mark.limit_consensus_modes(reason="save time")
-    @pytest.mark.anyio
-    async def test_basic_sync_wallet(self, two_wallet_nodes, default_400_blocks, self_hostname):
-        full_nodes, wallets, bt = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
+    for wallet_node, wallet_server in wallets:
+        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        # Trusted node sync
-        wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    for wallet_node, wallet_server in wallets:
+        await time_out_assert(100, wallet_height_at_least, True, wallet_node, 19)
-        # Untrusted node sync
-        wallets[1][0].config["trusted_peers"] = {}
-        for block in default_400_blocks:
-            await full_node_api.full_node.add_block(block)
+# Tests a reorg with the wallet
+@pytest.mark.anyio
+async def test_short_batch_sync_wallet(two_wallet_nodes, default_400_blocks, self_hostname):
+    full_nodes, wallets, _ = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
-        for wallet_node, wallet_server in wallets:
-            await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    # Trusted node sync
+    wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        for wallet_node, wallet_server in wallets:
-            await time_out_assert(100, wallet_height_at_least, True, wallet_node, len(default_400_blocks) - 1)
+    # Untrusted node sync
+    wallets[1][0].config["trusted_peers"] = {}
-        # Tests a reorg with the wallet
-        num_blocks = 30
-        blocks_reorg = bt.get_consecutive_blocks(num_blocks - 1, block_list_input=default_400_blocks[:-5])
-        blocks_reorg = bt.get_consecutive_blocks(1, blocks_reorg, guarantee_transaction_block=True, current_time=True)
-        for i in range(1, len(blocks_reorg)):
-            await full_node_api.full_node.add_block(blocks_reorg[i])
-        for wallet_node, wallet_server in wallets:
-            await disconnect_all_and_reconnect(wallet_server, full_node_server, self_hostname)
-        for wallet_node, wallet_server in wallets:
-            await time_out_assert(
-                100, wallet_height_at_least, True, wallet_node, len(default_400_blocks) + num_blocks - 5 - 1
-            )
-            await time_out_assert(20, wallet_node.wallet_state_manager.synced)
-            await disconnect_all(wallet_server)
-            assert not (await wallet_node.wallet_state_manager.synced())
+    for block in default_400_blocks[:200]:
+        await full_node_api.full_node.add_block(block)
-    @pytest.mark.parametrize(
-        "two_wallet_nodes",
-        [
-            dict(
-                disable_capabilities=[Capability.BLOCK_HEADERS],
-            ),
-            dict(
-                disable_capabilities=[Capability.BASE],
-            ),
-        ],
-        indirect=True,
-    )
-    @pytest.mark.limit_consensus_modes(reason="save time")
-    @pytest.mark.anyio
-    async def test_almost_recent(self, two_wallet_nodes, default_400_blocks, self_hostname, blockchain_constants):
-        # Tests the edge case of receiving funds right before the recent blocks  in weight proof
-        full_nodes, wallets, bt = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
-        # Trusted node sync
-        wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        # Untrusted node sync
-        wallets[1][0].config["trusted_peers"] = {}
-        base_num_blocks = 400
-        for block in default_400_blocks:
-            await full_node_api.full_node.add_block(block)
-        all_blocks = default_400_blocks
-        both_phs = []
-        for wallet_node, wallet_server in wallets:
-            wallet = wallet_node.wallet_state_manager.main_wallet
-            both_phs.append(await wallet.get_new_puzzlehash())
-        for i in range(20):
-            # Tests a reorg with the wallet
-            ph = both_phs[i % 2]
-            all_blocks = bt.get_consecutive_blocks(1, block_list_input=all_blocks, pool_reward_puzzle_hash=ph)
-            await full_node_api.full_node.add_block(all_blocks[-1])
-        new_blocks = bt.get_consecutive_blocks(
-            blockchain_constants.WEIGHT_PROOF_RECENT_BLOCKS + 10, block_list_input=all_blocks
-        )
-        for i in range(base_num_blocks + 20, len(new_blocks)):
-            await full_node_api.full_node.add_block(new_blocks[i])
+    for wallet_node, wallet_server in wallets:
+        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for wallet_node, wallet_server in wallets:
-            wallet = wallet_node.wallet_state_manager.main_wallet
-            await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-            await time_out_assert(30, wallet.get_confirmed_balance, 10 * calculate_pool_reward(uint32(1000)))
+    for wallet_node, wallet_server in wallets:
+        await time_out_assert(100, wallet_height_at_least, True, wallet_node, 199)
-    @pytest.mark.anyio
-    async def test_backtrack_sync_wallet(self, two_wallet_nodes, default_400_blocks, self_hostname):
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
-        # Trusted node sync
-        wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+@pytest.mark.limit_consensus_modes(reason="save time")
+@pytest.mark.anyio
+async def test_long_sync_wallet(two_wallet_nodes, default_1000_blocks, default_400_blocks, self_hostname):
+    full_nodes, wallets, bt = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
-        # Untrusted node sync
-        wallets[1][0].config["trusted_peers"] = {}
+    # Trusted node sync
+    wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        for block in default_400_blocks[:20]:
-            await full_node_api.full_node.add_block(block)
+    # Untrusted node sync
+    wallets[1][0].config["trusted_peers"] = {}
-        for wallet_node, wallet_server in wallets:
-            await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for block in default_400_blocks:
+        await full_node_api.full_node.add_block(block)
-        for wallet_node, wallet_server in wallets:
-            await time_out_assert(100, wallet_height_at_least, True, wallet_node, 19)
+    for wallet_node, wallet_server in wallets:
+        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-    # Tests a reorg with the wallet
-    @pytest.mark.anyio
-    async def test_short_batch_sync_wallet(self, two_wallet_nodes, default_400_blocks, self_hostname):
-        full_nodes, wallets, _ = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
+    for wallet_node, wallet_server in wallets:
+        await time_out_assert(600, wallet_height_at_least, True, wallet_node, len(default_400_blocks) - 1)
-        # Trusted node sync
-        wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    # Tests a long reorg
+    for block in default_1000_blocks:
+        await full_node_api.full_node.add_block(block)
-        # Untrusted node sync
-        wallets[1][0].config["trusted_peers"] = {}
+    for wallet_node, wallet_server in wallets:
+        await disconnect_all_and_reconnect(wallet_server, full_node_server, self_hostname)
-        for block in default_400_blocks[:200]:
-            await full_node_api.full_node.add_block(block)
+        log.info(f"wallet node height is {await wallet_node.wallet_state_manager.blockchain.get_finished_sync_up_to()}")
+        await time_out_assert(600, wallet_height_at_least, True, wallet_node, len(default_1000_blocks) - 1)
-        for wallet_node, wallet_server in wallets:
-            await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+        await disconnect_all_and_reconnect(wallet_server, full_node_server, self_hostname)
-        for wallet_node, wallet_server in wallets:
-            await time_out_assert(100, wallet_height_at_least, True, wallet_node, 199)
+    # Tests a short reorg
+    num_blocks = 30
+    blocks_reorg = bt.get_consecutive_blocks(num_blocks, block_list_input=default_1000_blocks[:-5])
-    @pytest.mark.limit_consensus_modes(reason="save time")
-    @pytest.mark.anyio
-    async def test_long_sync_wallet(self, two_wallet_nodes, default_1000_blocks, default_400_blocks, self_hostname):
-        full_nodes, wallets, bt = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
+    for i in range(len(blocks_reorg) - num_blocks - 10, len(blocks_reorg)):
+        await full_node_api.full_node.add_block(blocks_reorg[i])
-        # Trusted node sync
-        wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    for wallet_node, wallet_server in wallets:
+        await time_out_assert(
+            600, wallet_height_at_least, True, wallet_node, len(default_1000_blocks) + num_blocks - 5 - 1
+        )
-        # Untrusted node sync
-        wallets[1][0].config["trusted_peers"] = {}
-        for block in default_400_blocks:
-            await full_node_api.full_node.add_block(block)
+@pytest.mark.limit_consensus_modes(reason="save time")
+@pytest.mark.anyio
+async def test_wallet_reorg_sync(two_wallet_nodes, default_400_blocks, self_hostname):
+    num_blocks = 5
+    full_nodes, wallets, bt = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
-        for wallet_node, wallet_server in wallets:
-            await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    # Trusted node sync
+    wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        for wallet_node, wallet_server in wallets:
-            await time_out_assert(600, wallet_height_at_least, True, wallet_node, len(default_400_blocks) - 1)
+    # Untrusted node sync
+    wallets[1][0].config["trusted_peers"] = {}
-        # Tests a long reorg
-        for block in default_1000_blocks:
-            await full_node_api.full_node.add_block(block)
+    phs = []
+    for wallet_node, wallet_server in wallets:
+        wallet = wallet_node.wallet_state_manager.main_wallet
+        phs.append(await wallet.get_new_puzzlehash())
+        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for wallet_node, wallet_server in wallets:
-            await disconnect_all_and_reconnect(wallet_server, full_node_server, self_hostname)
+    # Insert 400 blocks
+    for block in default_400_blocks:
+        await full_node_api.full_node.add_block(block)
-            log.info(
-                f"wallet node height is {await wallet_node.wallet_state_manager.blockchain.get_finished_sync_up_to()}"
-            )
-            await time_out_assert(600, wallet_height_at_least, True, wallet_node, len(default_1000_blocks) - 1)
+    # Farm few more with reward
+    for i in range(0, num_blocks - 1):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(phs[0]))
-            await disconnect_all_and_reconnect(wallet_server, full_node_server, self_hostname)
+    for i in range(0, num_blocks):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(phs[1]))
-        # Tests a short reorg
-        num_blocks = 30
-        blocks_reorg = bt.get_consecutive_blocks(num_blocks, block_list_input=default_1000_blocks[:-5])
+    # Confirm we have the funds
+    funds = sum(
+        [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks)]
+    )
-        for i in range(len(blocks_reorg) - num_blocks - 10, len(blocks_reorg)):
-            await full_node_api.full_node.add_block(blocks_reorg[i])
+    for wallet_node, wallet_server in wallets:
+        wallet = wallet_node.wallet_state_manager.main_wallet
+        await time_out_assert(60, wallet.get_confirmed_balance, funds)
+        await time_out_assert(60, get_tx_count, 2 * (num_blocks - 1), wallet_node.wallet_state_manager, 1)
-        for wallet_node, wallet_server in wallets:
-            await time_out_assert(
-                600, wallet_height_at_least, True, wallet_node, len(default_1000_blocks) + num_blocks - 5 - 1
-            )
+    # Reorg blocks that carry reward
+    num_blocks = 30
+    blocks_reorg = bt.get_consecutive_blocks(num_blocks, block_list_input=default_400_blocks[:-5])
-    @pytest.mark.limit_consensus_modes(reason="save time")
-    @pytest.mark.anyio
-    async def test_wallet_reorg_sync(self, two_wallet_nodes, default_400_blocks, self_hostname):
-        num_blocks = 5
-        full_nodes, wallets, bt = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
+    for block in blocks_reorg[-30:]:
+        await full_node_api.full_node.add_block(block)
-        # Trusted node sync
-        wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    for wallet_node, wallet_server in wallets:
+        wallet = wallet_node.wallet_state_manager.main_wallet
+        await time_out_assert(60, get_tx_count, 0, wallet_node.wallet_state_manager, 1)
+        await time_out_assert(60, wallet.get_confirmed_balance, 0)
-        # Untrusted node sync
-        wallets[1][0].config["trusted_peers"] = {}
-        phs = []
-        for wallet_node, wallet_server in wallets:
-            wallet = wallet_node.wallet_state_manager.main_wallet
-            phs.append(await wallet.get_new_puzzlehash())
-            await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+@pytest.mark.limit_consensus_modes(reason="save time")
+@pytest.mark.anyio
+async def test_wallet_reorg_get_coinbase(two_wallet_nodes, default_400_blocks, self_hostname):
+    full_nodes, wallets, bt = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
-        # Insert 400 blocks
-        for block in default_400_blocks:
-            await full_node_api.full_node.add_block(block)
+    # Trusted node sync
+    wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        # Farm few more with reward
-        for i in range(0, num_blocks - 1):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(phs[0]))
+    # Untrusted node sync
+    wallets[1][0].config["trusted_peers"] = {}
-        for i in range(0, num_blocks):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(phs[1]))
+    for wallet_node, wallet_server in wallets:
+        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        # Confirm we have the funds
-        funds = sum(
-            [calculate_pool_reward(uint32(i)) + calculate_base_farmer_reward(uint32(i)) for i in range(1, num_blocks)]
-        )
+    # Insert 400 blocks
+    for block in default_400_blocks:
+        await full_node_api.full_node.add_block(block)
-        async def get_tx_count(wsm, wallet_id):
-            txs = await wsm.get_all_transactions(wallet_id)
-            return len(txs)
-        for wallet_node, wallet_server in wallets:
-            wallet = wallet_node.wallet_state_manager.main_wallet
-            await time_out_assert(60, wallet.get_confirmed_balance, funds)
-            await time_out_assert(60, get_tx_count, 2 * (num_blocks - 1), wallet_node.wallet_state_manager, 1)
-        # Reorg blocks that carry reward
-        num_blocks = 30
-        blocks_reorg = bt.get_consecutive_blocks(num_blocks, block_list_input=default_400_blocks[:-5])
-        for block in blocks_reorg[-30:]:
-            await full_node_api.full_node.add_block(block)
-        for wallet_node, wallet_server in wallets:
-            wallet = wallet_node.wallet_state_manager.main_wallet
-            await time_out_assert(60, get_tx_count, 0, wallet_node.wallet_state_manager, 1)
-            await time_out_assert(60, wallet.get_confirmed_balance, 0)
-    @pytest.mark.limit_consensus_modes(reason="save time")
-    @pytest.mark.anyio
-    async def test_wallet_reorg_get_coinbase(self, two_wallet_nodes, default_400_blocks, self_hostname):
-        full_nodes, wallets, bt = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
-        # Trusted node sync
-        wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        # Untrusted node sync
-        wallets[1][0].config["trusted_peers"] = {}
-        for wallet_node, wallet_server in wallets:
-            await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        # Insert 400 blocks
-        for block in default_400_blocks:
-            await full_node_api.full_node.add_block(block)
-        # Reorg blocks that carry reward
-        num_blocks_reorg = 30
-        blocks_reorg = bt.get_consecutive_blocks(num_blocks_reorg, block_list_input=default_400_blocks[:-5])
-        for block in blocks_reorg[:-5]:
-            await full_node_api.full_node.add_block(block)
-        async def get_tx_count(wsm, wallet_id):
-            txs = await wsm.get_all_transactions(wallet_id)
-            return len(txs)
-        for wallet_node, wallet_server in wallets:
-            await time_out_assert(30, get_tx_count, 0, wallet_node.wallet_state_manager, 1)
-            await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=30)
-        num_blocks_reorg_1 = 40
-        all_blocks_reorg_2 = blocks_reorg[:-30]
-        for wallet_node, wallet_server in wallets:
-            wallet = wallet_node.wallet_state_manager.main_wallet
-            ph = await wallet.get_new_puzzlehash()
-            all_blocks_reorg_2 = bt.get_consecutive_blocks(
-                1, pool_reward_puzzle_hash=ph, farmer_reward_puzzle_hash=ph, block_list_input=all_blocks_reorg_2
-            )
-        blocks_reorg_2 = bt.get_consecutive_blocks(num_blocks_reorg_1, block_list_input=all_blocks_reorg_2)
+    # Reorg blocks that carry reward
+    num_blocks_reorg = 30
+    blocks_reorg = bt.get_consecutive_blocks(num_blocks_reorg, block_list_input=default_400_blocks[:-5])
-        for block in blocks_reorg_2[-44:]:
-            await full_node_api.full_node.add_block(block)
+    for block in blocks_reorg[:-5]:
+        await full_node_api.full_node.add_block(block)
-        for wallet_node, wallet_server in wallets:
-            await disconnect_all_and_reconnect(wallet_server, full_node_server, self_hostname)
+    for wallet_node, wallet_server in wallets:
+        await time_out_assert(30, get_tx_count, 0, wallet_node.wallet_state_manager, 1)
+        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=30)
-        # Confirm we have the funds
-        funds = calculate_pool_reward(uint32(len(all_blocks_reorg_2))) + calculate_base_farmer_reward(
-            uint32(len(all_blocks_reorg_2))
+    num_blocks_reorg_1 = 40
+    all_blocks_reorg_2 = blocks_reorg[:-30]
+    for wallet_node, wallet_server in wallets:
+        wallet = wallet_node.wallet_state_manager.main_wallet
+        ph = await wallet.get_new_puzzlehash()
+        all_blocks_reorg_2 = bt.get_consecutive_blocks(
+            1, pool_reward_puzzle_hash=ph, farmer_reward_puzzle_hash=ph, block_list_input=all_blocks_reorg_2
         )
+    blocks_reorg_2 = bt.get_consecutive_blocks(num_blocks_reorg_1, block_list_input=all_blocks_reorg_2)
-        for wallet_node, wallet_server in wallets:
-            wallet = wallet_node.wallet_state_manager.main_wallet
-            await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=60)
+    for block in blocks_reorg_2[-44:]:
+        await full_node_api.full_node.add_block(block)
-            await time_out_assert(20, get_tx_count, 2, wallet_node.wallet_state_manager, 1)
-            await time_out_assert(20, wallet.get_confirmed_balance, funds)
+    for wallet_node, wallet_server in wallets:
+        await disconnect_all_and_reconnect(wallet_server, full_node_server, self_hostname)
-    @pytest.mark.anyio
-    async def test_request_additions_errors(self, simulator_and_wallet, self_hostname):
-        full_nodes, wallets, _ = simulator_and_wallet
-        wallet_node, wallet_server = wallets[0]
+    # Confirm we have the funds
+    funds = calculate_pool_reward(uint32(len(all_blocks_reorg_2))) + calculate_base_farmer_reward(
+        uint32(len(all_blocks_reorg_2))
+    )
+    for wallet_node, wallet_server in wallets:
         wallet = wallet_node.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
+        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=60)
-        full_node_api = full_nodes[0]
-        await wallet_server.start_client(PeerInfo(self_hostname, full_node_api.full_node.server.get_port()), None)
+        await time_out_assert(20, get_tx_count, 2, wallet_node.wallet_state_manager, 1)
+        await time_out_assert(20, wallet.get_confirmed_balance, funds)
-        for i in range(2):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
+@pytest.mark.anyio
+async def test_request_additions_errors(simulator_and_wallet, self_hostname):
+    full_nodes, wallets, _ = simulator_and_wallet
+    wallet_node, wallet_server = wallets[0]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
-        last_block: Optional[BlockRecord] = full_node_api.full_node.blockchain.get_peak()
-        assert last_block is not None
+    full_node_api = full_nodes[0]
+    await wallet_server.start_client(PeerInfo(self_hostname, full_node_api.full_node.server.get_port()), None)
-        # Invalid height
-        with pytest.raises(ValueError):
-            await full_node_api.request_additions(RequestAdditions(uint64(100), last_block.header_hash, [ph]))
+    for i in range(2):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        # Invalid header hash
-        with pytest.raises(ValueError):
-            await full_node_api.request_additions(RequestAdditions(last_block.height, std_hash(b""), [ph]))
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        # No results
-        res1: Optional[Message] = await full_node_api.request_additions(
-            RequestAdditions(last_block.height, last_block.header_hash, [std_hash(b"")])
-        )
-        assert res1 is not None
-        response = RespondAdditions.from_bytes(res1.data)
-        assert response.height == last_block.height
-        assert response.header_hash == last_block.header_hash
-        assert len(response.proofs) == 1
-        assert len(response.coins) == 1
-        assert response.proofs[0][0] == std_hash(b"")
-        assert response.proofs[0][1] is not None
-        assert response.proofs[0][2] is None
-    @pytest.mark.anyio
-    async def test_request_additions_success(self, simulator_and_wallet, self_hostname):
-        full_nodes, wallets, _ = simulator_and_wallet
-        wallet_node, wallet_server = wallets[0]
-        wallet = wallet_node.wallet_state_manager.main_wallet
-        ph = await wallet.get_new_puzzlehash()
+    last_block: Optional[BlockRecord] = full_node_api.full_node.blockchain.get_peak()
+    assert last_block is not None
-        full_node_api = full_nodes[0]
-        await wallet_server.start_client(PeerInfo(self_hostname, full_node_api.full_node.server.get_port()), None)
+    # Invalid height
+    with pytest.raises(ValueError):
+        await full_node_api.request_additions(RequestAdditions(uint64(100), last_block.header_hash, [ph]))
-        for i in range(2):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    # Invalid header hash
+    with pytest.raises(ValueError):
+        await full_node_api.request_additions(RequestAdditions(last_block.height, std_hash(b""), [ph]))
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
+    # No results
+    res1: Optional[Message] = await full_node_api.request_additions(
+        RequestAdditions(last_block.height, last_block.header_hash, [std_hash(b"")])
+    )
+    assert res1 is not None
+    response = RespondAdditions.from_bytes(res1.data)
+    assert response.height == last_block.height
+    assert response.header_hash == last_block.header_hash
+    assert len(response.proofs) == 1
+    assert len(response.coins) == 1
-        payees: List[Payment] = []
-        for i in range(10):
-            payee_ph = await wallet.get_new_puzzlehash()
-            payees.append(Payment(payee_ph, uint64(i + 100)))
-            payees.append(Payment(payee_ph, uint64(i + 200)))
+    assert response.proofs[0][0] == std_hash(b"")
+    assert response.proofs[0][1] is not None
+    assert response.proofs[0][2] is None
-        [tx] = await wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
-        await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+@pytest.mark.anyio
+async def test_request_additions_success(simulator_and_wallet, self_hostname):
+    full_nodes, wallets, _ = simulator_and_wallet
+    wallet_node, wallet_server = wallets[0]
+    wallet = wallet_node.wallet_state_manager.main_wallet
+    ph = await wallet.get_new_puzzlehash()
-        last_block: Optional[BlockRecord] = full_node_api.full_node.blockchain.get_peak()
-        assert last_block is not None
-        await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
+    full_node_api = full_nodes[0]
+    await wallet_server.start_client(PeerInfo(self_hostname, full_node_api.full_node.server.get_port()), None)
-        res2: Optional[Message] = await full_node_api.request_additions(
-            RequestAdditions(
-                last_block.height,
-                None,
-                [payees[0].puzzle_hash, payees[2].puzzle_hash, std_hash(b"1")],
-            )
-        )
+    for i in range(2):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        assert res2 is not None
-        response = RespondAdditions.from_bytes(res2.data)
-        assert response.height == last_block.height
-        assert response.header_hash == last_block.header_hash
-        assert len(response.proofs) == 3
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        # First two PHs are included
-        for i in range(2):
-            assert response.proofs[i][0] in {payees[j].puzzle_hash for j in (0, 2)}
-            assert response.proofs[i][1] is not None
-            assert response.proofs[i][2] is not None
+    payees: List[Payment] = []
+    for i in range(10):
+        payee_ph = await wallet.get_new_puzzlehash()
+        payees.append(Payment(payee_ph, uint64(i + 100)))
+        payees.append(Payment(payee_ph, uint64(i + 200)))
-        # Third PH is not included
-        assert response.proofs[2][2] is None
+    [tx] = await wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
+    await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
-        coin_list_dict = {p: coin_list for p, coin_list in response.coins}
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        assert len(coin_list_dict) == 3
-        for p, coin_list in coin_list_dict.items():
-            if p == std_hash(b"1"):
-                # this is the one that is not included
-                assert len(coin_list) == 0
-            else:
-                for coin in coin_list:
-                    assert coin.puzzle_hash == p
-                # The other ones are included
-                assert len(coin_list) == 2
-        # None for puzzle hashes returns all coins and no proofs
-        res3: Optional[Message] = await full_node_api.request_additions(
-            RequestAdditions(last_block.height, last_block.header_hash, None)
-        )
+    last_block: Optional[BlockRecord] = full_node_api.full_node.blockchain.get_peak()
+    assert last_block is not None
+    await full_node_api.wait_for_wallet_synced(wallet_node=wallet_node, timeout=20)
-        assert res3 is not None
-        response = RespondAdditions.from_bytes(res3.data)
-        assert response.height == last_block.height
-        assert response.header_hash == last_block.header_hash
-        assert response.proofs is None
-        assert len(response.coins) == 12
-        assert sum([len(c_list) for _, c_list in response.coins]) == 24
-        # [] for puzzle hashes returns nothing
-        res4: Optional[Message] = await full_node_api.request_additions(
-            RequestAdditions(last_block.height, last_block.header_hash, [])
-        )
-        assert res4 is not None
-        response = RespondAdditions.from_bytes(res4.data)
-        assert response.proofs == []
-        assert len(response.coins) == 0
-    @pytest.mark.anyio
-    async def test_get_wp_fork_point(self, default_10000_blocks, blockchain_constants):
-        blocks = default_10000_blocks
-        header_cache, height_to_hash, sub_blocks, summaries = await load_blocks_dont_validate(
-            blocks, blockchain_constants
+    res2: Optional[Message] = await full_node_api.request_additions(
+        RequestAdditions(
+            last_block.height,
+            None,
+            [payees[0].puzzle_hash, payees[2].puzzle_hash, std_hash(b"1")],
         )
-        wpf = WeightProofHandler(blockchain_constants, BlockCache(sub_blocks, header_cache, height_to_hash, summaries))
-        wp1 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(9000)]].header_hash)
-        wp2 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(9030)]].header_hash)
-        wp3 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(7500)]].header_hash)
-        wp4 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(8700)]].header_hash)
-        wp5 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(9700)]].header_hash)
-        wp6 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(9010)]].header_hash)
-        fork12 = get_wp_fork_point(blockchain_constants, wp1, wp2)
-        fork13 = get_wp_fork_point(blockchain_constants, wp3, wp1)
-        fork14 = get_wp_fork_point(blockchain_constants, wp4, wp1)
-        fork23 = get_wp_fork_point(blockchain_constants, wp3, wp2)
-        fork24 = get_wp_fork_point(blockchain_constants, wp4, wp2)
-        fork34 = get_wp_fork_point(blockchain_constants, wp3, wp4)
-        fork45 = get_wp_fork_point(blockchain_constants, wp4, wp5)
-        fork16 = get_wp_fork_point(blockchain_constants, wp1, wp6)
-        # overlap between recent chain in wps, fork point is the tip of the shorter wp
-        assert fork12 == wp1.recent_chain_data[-1].height
-        assert fork16 == wp1.recent_chain_data[-1].height
-        # if there is an overlap between the recent chains we can find the exact fork point
-        # if not we should get the latest block with a sub epoch summary that exists in both wp's
-        # this can happen in fork24 and fork14 since they are not very far and also not very close
-        if wp2.recent_chain_data[0].height > wp4.recent_chain_data[-1].height:
-            assert fork24 in summaries.keys()
-            assert fork24 < wp4.recent_chain_data[-1].height
-        else:
-            assert fork24 == wp4.recent_chain_data[-1].height
+    )
+    assert res2 is not None
+    response = RespondAdditions.from_bytes(res2.data)
+    assert response.height == last_block.height
+    assert response.header_hash == last_block.header_hash
+    assert len(response.proofs) == 3
+    # First two PHs are included
+    for i in range(2):
+        assert response.proofs[i][0] in {payees[j].puzzle_hash for j in (0, 2)}
+        assert response.proofs[i][1] is not None
+        assert response.proofs[i][2] is not None
+    # Third PH is not included
+    assert response.proofs[2][2] is None
-        if wp1.recent_chain_data[0].height > wp4.recent_chain_data[-1].height:
-            assert fork14 in summaries.keys()
-            assert fork14 < wp4.recent_chain_data[-1].height
+    coin_list_dict = {p: coin_list for p, coin_list in response.coins}
+    assert len(coin_list_dict) == 3
+    for p, coin_list in coin_list_dict.items():
+        if p == std_hash(b"1"):
+            # this is the one that is not included
+            assert len(coin_list) == 0
         else:
-            assert fork14 == wp4.recent_chain_data[-1].height
-        # no overlap between recent chain in wps, fork point
-        # is the latest block with a sub epoch summary that exists in both wp's
-        assert fork13 in summaries.keys()
-        assert fork13 < wp3.recent_chain_data[-1].height
-        assert fork23 in summaries.keys()
-        assert fork23 < wp3.recent_chain_data[-1].height
-        assert fork34 in summaries.keys()
-        assert fork23 < wp3.recent_chain_data[-1].height
-        assert fork45 in summaries.keys()
-        assert fork45 < wp4.recent_chain_data[-1].height
-    """
-    This tests that a wallet filters out the dust properly.
-    It runs in seven phases:
-    1. Create a single dust coin.
-       Typically (though there are edge cases), this coin will not be filtered.
-    2. Create dust coins until the filter threshold has been reached.
-       At this point, none of the dust should be filtered.
-    3. Create 10 coins that are exactly the size of the filter threshold.
-       These should not be filtered because they are not dust.
-    4. Create one more dust coin. This coin should be filtered.
-    5. Create 5 coins below the threshold and 5 at or above.
-       Those below the threshold should get filtered, and those above should not.
-    6. Clear all coins from the dust wallet.
-       Send to the dust wallet "spam_filter_after_n_txs" coins that are equal in value to "xch_spam_amount".
-       Send 1 mojo from the dust wallet. The dust wallet should receive a change coin valued at "xch_spam_amount-1".
-    7: Create an NFT wallet for the farmer wallet, and generate an NFT in that wallet.
-       Create an NFT wallet for the dust wallet.
-       Send the NFT to the dust wallet. The NFT should not be filtered.
-    """
-    @pytest.mark.anyio
-    @pytest.mark.parametrize(
-        "spam_filter_after_n_txs, xch_spam_amount, dust_value",
-        [
-            # In the following tests, the filter is run right away:
-            (0, 1, 1),  # nothing is filtered
-            # In the following tests, 1 coin will be created in part 1, and 9 in part 2:
-            (10, 10000000000, 1),  # everything is dust
-            (10, 10000000000, 10000000000),  # max dust threshold, dust is same size so not filtered
-            # Test with more coins
-            (105, 1000000, 1),  # default filter level (1m mojos), default dust size (1)
-        ],
+            for coin in coin_list:
+                assert coin.puzzle_hash == p
+            # The other ones are included
+            assert len(coin_list) == 2
+    # None for puzzle hashes returns all coins and no proofs
+    res3: Optional[Message] = await full_node_api.request_additions(
+        RequestAdditions(last_block.height, last_block.header_hash, None)
     )
-    async def test_dusted_wallet(
-        self,
-        self_hostname,
-        two_wallet_nodes_custom_spam_filtering,
-        spam_filter_after_n_txs,
-        xch_spam_amount,
-        dust_value,
-    ):
-        full_nodes, wallets, _ = two_wallet_nodes_custom_spam_filtering
-        farm_wallet_node, farm_wallet_server = wallets[0]
-        dust_wallet_node, dust_wallet_server = wallets[1]
-        # Create two wallets, one for farming (not used for testing), and one for testing dust.
-        farm_wallet = farm_wallet_node.wallet_state_manager.main_wallet
-        dust_wallet = dust_wallet_node.wallet_state_manager.main_wallet
-        ph = await farm_wallet.get_new_puzzlehash()
-        full_node_api = full_nodes[0]
-        # It's also possible to obtain the current settings for spam_filter_after_n_txs and xch_spam_amount
-        # spam_filter_after_n_txs = wallets[0][0].config["spam_filter_after_n_txs"]
-        # xch_spam_amount = wallets[0][0].config["xch_spam_amount"]
-        # dust_value=1
-        # Verify legal values for the settings to be tested
-        # If spam_filter_after_n_txs is greater than 250, this test will take a long time to run.
-        # Current max value for xch_spam_amount is 0.01 XCH.
-        # If needed, this could be increased but we would need to farm more blocks.
-        # The max dust_value could be increased, but would require farming more blocks.
-        assert spam_filter_after_n_txs >= 0
-        assert spam_filter_after_n_txs <= 250
-        assert xch_spam_amount >= 1
-        assert xch_spam_amount <= 10000000000
-        assert dust_value >= 1
-        assert dust_value <= 10000000000
-        # start both clients
-        await farm_wallet_server.start_client(PeerInfo(self_hostname, full_node_api.full_node.server.get_port()), None)
-        await dust_wallet_server.start_client(PeerInfo(self_hostname, full_node_api.full_node.server.get_port()), None)
-        # Farm two blocks
-        for i in range(2):
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        # sync both nodes
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    assert res3 is not None
+    response = RespondAdditions.from_bytes(res3.data)
+    assert response.height == last_block.height
+    assert response.header_hash == last_block.header_hash
+    assert response.proofs is None
+    assert len(response.coins) == 12
+    assert sum([len(c_list) for _, c_list in response.coins]) == 24
+    # [] for puzzle hashes returns nothing
+    res4: Optional[Message] = await full_node_api.request_additions(
+        RequestAdditions(last_block.height, last_block.header_hash, [])
+    )
+    assert res4 is not None
+    response = RespondAdditions.from_bytes(res4.data)
+    assert response.proofs == []
+    assert len(response.coins) == 0
+@pytest.mark.anyio
+async def test_get_wp_fork_point(default_10000_blocks, blockchain_constants):
+    blocks = default_10000_blocks
+    header_cache, height_to_hash, sub_blocks, summaries = await load_blocks_dont_validate(blocks, blockchain_constants)
+    wpf = WeightProofHandler(blockchain_constants, BlockCache(sub_blocks, header_cache, height_to_hash, summaries))
+    wp1 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(9000)]].header_hash)
+    wp2 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(9030)]].header_hash)
+    wp3 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(7500)]].header_hash)
+    wp4 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(8700)]].header_hash)
+    wp5 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(9700)]].header_hash)
+    wp6 = await wpf.get_proof_of_weight(header_cache[height_to_hash[uint32(9010)]].header_hash)
+    fork12 = get_wp_fork_point(blockchain_constants, wp1, wp2)
+    fork13 = get_wp_fork_point(blockchain_constants, wp3, wp1)
+    fork14 = get_wp_fork_point(blockchain_constants, wp4, wp1)
+    fork23 = get_wp_fork_point(blockchain_constants, wp3, wp2)
+    fork24 = get_wp_fork_point(blockchain_constants, wp4, wp2)
+    fork34 = get_wp_fork_point(blockchain_constants, wp3, wp4)
+    fork45 = get_wp_fork_point(blockchain_constants, wp4, wp5)
+    fork16 = get_wp_fork_point(blockchain_constants, wp1, wp6)
+    # overlap between recent chain in wps, fork point is the tip of the shorter wp
+    assert fork12 == wp1.recent_chain_data[-1].height
+    assert fork16 == wp1.recent_chain_data[-1].height
+    # if there is an overlap between the recent chains we can find the exact fork point
+    # if not we should get the latest block with a sub epoch summary that exists in both wp's
+    # this can happen in fork24 and fork14 since they are not very far and also not very close
+    if wp2.recent_chain_data[0].height > wp4.recent_chain_data[-1].height:
+        assert fork24 in summaries.keys()
+        assert fork24 < wp4.recent_chain_data[-1].height
+    else:
+        assert fork24 == wp4.recent_chain_data[-1].height
+    if wp1.recent_chain_data[0].height > wp4.recent_chain_data[-1].height:
+        assert fork14 in summaries.keys()
+        assert fork14 < wp4.recent_chain_data[-1].height
+    else:
+        assert fork14 == wp4.recent_chain_data[-1].height
+    # no overlap between recent chain in wps, fork point
+    # is the latest block with a sub epoch summary that exists in both wp's
+    assert fork13 in summaries.keys()
+    assert fork13 < wp3.recent_chain_data[-1].height
+    assert fork23 in summaries.keys()
+    assert fork23 < wp3.recent_chain_data[-1].height
+    assert fork34 in summaries.keys()
+    assert fork23 < wp3.recent_chain_data[-1].height
+    assert fork45 in summaries.keys()
+    assert fork45 < wp4.recent_chain_data[-1].height
+"""
+This tests that a wallet filters out the dust properly.
+It runs in seven phases:
+1. Create a single dust coin.
+    Typically (though there are edge cases), this coin will not be filtered.
+2. Create dust coins until the filter threshold has been reached.
+    At this point, none of the dust should be filtered.
+3. Create 10 coins that are exactly the size of the filter threshold.
+    These should not be filtered because they are not dust.
+4. Create one more dust coin. This coin should be filtered.
+5. Create 5 coins below the threshold and 5 at or above.
+    Those below the threshold should get filtered, and those above should not.
+6. Clear all coins from the dust wallet.
+    Send to the dust wallet "spam_filter_after_n_txs" coins that are equal in value to "xch_spam_amount".
+    Send 1 mojo from the dust wallet. The dust wallet should receive a change coin valued at "xch_spam_amount-1".
+7: Create an NFT wallet for the farmer wallet, and generate an NFT in that wallet.
+    Create an NFT wallet for the dust wallet.
+    Send the NFT to the dust wallet. The NFT should not be filtered.
+"""
+@pytest.mark.anyio
+@pytest.mark.parametrize(
+    "spam_filter_after_n_txs, xch_spam_amount, dust_value",
+    [
+        # In the following tests, the filter is run right away:
+        (0, 1, 1),  # nothing is filtered
+        # In the following tests, 1 coin will be created in part 1, and 9 in part 2:
+        (10, 10000000000, 1),  # everything is dust
+        (10, 10000000000, 10000000000),  # max dust threshold, dust is same size so not filtered
+        # Test with more coins
+        (105, 1000000, 1),  # default filter level (1m mojos), default dust size (1)
+    ],
+)
+async def test_dusted_wallet(
+    self_hostname, two_wallet_nodes_custom_spam_filtering, spam_filter_after_n_txs, xch_spam_amount, dust_value
+):
+    full_nodes, wallets, _ = two_wallet_nodes_custom_spam_filtering
+    farm_wallet_node, farm_wallet_server = wallets[0]
+    dust_wallet_node, dust_wallet_server = wallets[1]
+    # Create two wallets, one for farming (not used for testing), and one for testing dust.
+    farm_wallet = farm_wallet_node.wallet_state_manager.main_wallet
+    dust_wallet = dust_wallet_node.wallet_state_manager.main_wallet
+    ph = await farm_wallet.get_new_puzzlehash()
+    full_node_api = full_nodes[0]
+    # It's also possible to obtain the current settings for spam_filter_after_n_txs and xch_spam_amount
+    # spam_filter_after_n_txs = wallets[0][0].config["spam_filter_after_n_txs"]
+    # xch_spam_amount = wallets[0][0].config["xch_spam_amount"]
+    # dust_value=1
+    # Verify legal values for the settings to be tested
+    # If spam_filter_after_n_txs is greater than 250, this test will take a long time to run.
+    # Current max value for xch_spam_amount is 0.01 XCH.
+    # If needed, this could be increased but we would need to farm more blocks.
+    # The max dust_value could be increased, but would require farming more blocks.
+    assert spam_filter_after_n_txs >= 0
+    assert spam_filter_after_n_txs <= 250
+    assert xch_spam_amount >= 1
+    assert xch_spam_amount <= 10000000000
+    assert dust_value >= 1
+    assert dust_value <= 10000000000
+    # start both clients
+    await farm_wallet_server.start_client(PeerInfo(self_hostname, full_node_api.full_node.server.get_port()), None)
+    await dust_wallet_server.start_client(PeerInfo(self_hostname, full_node_api.full_node.server.get_port()), None)
+    # Farm two blocks
+    for i in range(2):
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        # Part 1: create a single dust coin
-        payees: List[Payment] = []
+    # sync both nodes
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # Part 1: create a single dust coin
+    payees: List[Payment] = []
+    payee_ph = await dust_wallet.get_new_puzzlehash()
+    payees.append(Payment(payee_ph, uint64(dust_value)))
+    # construct and send tx
+    [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
+    await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+    await full_node_api.wait_transaction_records_entered_mempool([tx])
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # The dust is only filtered at this point if spam_filter_after_n_txs is 0 and xch_spam_amount is > dust_value.
+    if spam_filter_after_n_txs > 0:
+        dust_coins = 1
+        large_dust_coins = 0
+        large_dust_balance = 0
+    elif xch_spam_amount <= dust_value:
+        dust_coins = 0
+        large_dust_coins = 1
+        large_dust_balance = dust_value
+    else:
+        dust_coins = 0
+        large_dust_coins = 0
+        large_dust_balance = 0
+    # Obtain and log important values
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    log.info(f"all_unspent is {all_unspent}")
+    small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
+    balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+    num_coins: Optional[Message] = len(await dust_wallet.select_coins(balance, DEFAULT_COIN_SELECTION_CONFIG))
+    log.info(f"Small coin count is {small_unspent_count}")
+    log.info(f"Wallet balance is {balance}")
+    log.info(f"Number of coins is {num_coins}")
+    log.info(f"spam_filter_after_n_txs {spam_filter_after_n_txs}")
+    log.info(f"xch_spam_amount {xch_spam_amount}")
+    log.info(f"dust_value {dust_value}")
+    # Verify balance and number of coins not filtered.
+    assert balance == dust_coins * dust_value + large_dust_balance
+    assert num_coins == dust_coins + large_dust_coins
+    # Part 2: Create dust coins until the filter threshold has been reached.
+    # Nothing should be filtered yet (unless spam_filter_after_n_txs is 0).
+    payees = []
+    # Determine how much dust to create, recalling that there already is one dust coin.
+    new_dust = spam_filter_after_n_txs - 1
+    dust_remaining = new_dust
+    while dust_remaining > 0:
         payee_ph = await dust_wallet.get_new_puzzlehash()
         payees.append(Payment(payee_ph, uint64(dust_value)))
-        # construct and send tx
-        [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
-        await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
-        await full_node_api.wait_transaction_records_entered_mempool([tx])
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        # The dust is only filtered at this point if spam_filter_after_n_txs is 0 and xch_spam_amount is > dust_value.
-        if spam_filter_after_n_txs > 0:
-            dust_coins = 1
-            large_dust_coins = 0
-            large_dust_balance = 0
-        elif xch_spam_amount <= dust_value:
-            dust_coins = 0
-            large_dust_coins = 1
-            large_dust_balance = dust_value
-        else:
-            dust_coins = 0
-            large_dust_coins = 0
-            large_dust_balance = 0
-        # Obtain and log important values
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        log.info(f"all_unspent is {all_unspent}")
-        small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
-        balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
-        num_coins: Optional[Message] = len(await dust_wallet.select_coins(balance, DEFAULT_COIN_SELECTION_CONFIG))
-        log.info(f"Small coin count is {small_unspent_count}")
-        log.info(f"Wallet balance is {balance}")
-        log.info(f"Number of coins is {num_coins}")
-        log.info(f"spam_filter_after_n_txs {spam_filter_after_n_txs}")
-        log.info(f"xch_spam_amount {xch_spam_amount}")
-        log.info(f"dust_value {dust_value}")
-        # Verify balance and number of coins not filtered.
-        assert balance == dust_coins * dust_value + large_dust_balance
-        assert num_coins == dust_coins + large_dust_coins
-        # Part 2: Create dust coins until the filter threshold has been reached.
-        # Nothing should be filtered yet (unless spam_filter_after_n_txs is 0).
-        payees = []
-        # Determine how much dust to create, recalling that there already is one dust coin.
-        new_dust = spam_filter_after_n_txs - 1
-        dust_remaining = new_dust
-        while dust_remaining > 0:
-            payee_ph = await dust_wallet.get_new_puzzlehash()
-            payees.append(Payment(payee_ph, uint64(dust_value)))
-            # After every 100 (at most) coins added, push the tx and advance the chain
-            # This greatly speeds up the overall process
-            if dust_remaining % 100 == 0 and dust_remaining != new_dust:
-                # construct and send tx
-                [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
-                await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
-                # advance the chain and sync both wallets
-                await full_node_api.wait_transaction_records_entered_mempool([tx])
-                await full_node_api.wait_for_wallets_synced(
-                    wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20
-                )
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-                await full_node_api.wait_for_wallets_synced(
-                    wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20
-                )
-                # reset payees
-                payees = []
-            dust_remaining -= 1
-        # Only need to create tx if there was new dust to be added
-        if new_dust >= 1:
+        # After every 100 (at most) coins added, push the tx and advance the chain
+        # This greatly speeds up the overall process
+        if dust_remaining % 100 == 0 and dust_remaining != new_dust:
             # construct and send tx
             [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
             await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
         @@@ -812,44 -812,44 +767,13 @@@
             await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
             await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
             await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+            # reset payees
+            payees = []
-        # Obtain and log important values
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
-        balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
-        # Selecting coins by using the wallet's coin selection algorithm won't work for large
-        # numbers of coins, so we'll use the state manager for the rest of the test
-        # num_coins: Optional[Message] = len(await dust_wallet.select_coins(balance))
-        num_coins: Optional[Message] = len(
-            list(await dust_wallet_node.wallet_state_manager.get_spendable_coins_for_wallet(1))
-        )
-        log.info(f"Small coin count is {small_unspent_count}")
-        log.info(f"Wallet balance is {balance}")
-        log.info(f"Number of coins is {num_coins}")
-        # obtain the total expected coins (new_dust could be negative)
-        if new_dust > 0:
-            dust_coins += new_dust
-        # Make sure the number of coins matches the expected number.
-        # At this point, nothing should be getting filtered unless spam_filter_after_n_txs is 0.
-        assert dust_coins == spam_filter_after_n_txs
-        assert balance == dust_coins * dust_value + large_dust_balance
-        assert num_coins == dust_coins + large_dust_coins
-        # Part 3: Create 10 coins that are exactly the size of the filter threshold.
-        # These should not get filtered.
-        large_coins = 10
-        payees = []
-        for i in range(large_coins):
-            payee_ph = await dust_wallet.get_new_puzzlehash()
-            payees.append(Payment(payee_ph, uint64(xch_spam_amount)))
+        dust_remaining -= 1
+    # Only need to create tx if there was new dust to be added
+    if new_dust >= 1:
         # construct and send tx
         [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
         await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
         @@@ -860,485 -860,485 +784,505 @@@
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
         await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        # Obtain and log important values
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
-        balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
-        num_coins: Optional[Message] = len(
-            list(await dust_wallet_node.wallet_state_manager.get_spendable_coins_for_wallet(1))
-        )
-        log.info(f"Small coin count is {small_unspent_count}")
-        log.info(f"Wallet balance is {balance}")
-        log.info(f"Number of coins is {num_coins}")
-        large_coin_balance = large_coins * xch_spam_amount
-        # Determine whether the filter should have been activated.
-        # Make sure the number of coins matches the expected number.
-        # At this point, nothing should be getting filtered unless spam_filter_after_n_txs is 0.
-        assert dust_coins == spam_filter_after_n_txs
-        assert balance == dust_coins * dust_value + large_coins * xch_spam_amount + large_dust_balance
-        assert num_coins == dust_coins + large_coins + large_dust_coins
-        # Part 4: Create one more dust coin to test the threshold
-        payees = []
+    # Obtain and log important values
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
+    balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+    # Selecting coins by using the wallet's coin selection algorithm won't work for large
+    # numbers of coins, so we'll use the state manager for the rest of the test
+    # num_coins: Optional[Message] = len(await dust_wallet.select_coins(balance))
+    spendable_coins = await dust_wallet_node.wallet_state_manager.get_spendable_coins_for_wallet(1)
+    num_coins = len(spendable_coins)
+    log.info(f"Small coin count is {small_unspent_count}")
+    log.info(f"Wallet balance is {balance}")
+    log.info(f"Number of coins is {num_coins}")
+    # obtain the total expected coins (new_dust could be negative)
+    if new_dust > 0:
+        dust_coins += new_dust
+    # Make sure the number of coins matches the expected number.
+    # At this point, nothing should be getting filtered unless spam_filter_after_n_txs is 0.
+    assert dust_coins == spam_filter_after_n_txs
+    assert balance == dust_coins * dust_value + large_dust_balance
+    assert num_coins == dust_coins + large_dust_coins
+    # Part 3: Create 10 coins that are exactly the size of the filter threshold.
+    # These should not get filtered.
+    large_coins = 10
+    payees = []
+    for i in range(large_coins):
+        payee_ph = await dust_wallet.get_new_puzzlehash()
+        payees.append(Payment(payee_ph, uint64(xch_spam_amount)))
+    # construct and send tx
+    [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
+    await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+    # advance the chain and sync both wallets
+    await full_node_api.wait_transaction_records_entered_mempool([tx])
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # Obtain and log important values
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
+    balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+    spendable_coins = await dust_wallet_node.wallet_state_manager.get_spendable_coins_for_wallet(1)
+    num_coins = len(spendable_coins)
+    log.info(f"Small coin count is {small_unspent_count}")
+    log.info(f"Wallet balance is {balance}")
+    log.info(f"Number of coins is {num_coins}")
+    large_coin_balance = large_coins * xch_spam_amount
+    # Determine whether the filter should have been activated.
+    # Make sure the number of coins matches the expected number.
+    # At this point, nothing should be getting filtered unless spam_filter_after_n_txs is 0.
+    assert dust_coins == spam_filter_after_n_txs
+    assert balance == dust_coins * dust_value + large_coins * xch_spam_amount + large_dust_balance
+    assert num_coins == dust_coins + large_coins + large_dust_coins
+    # Part 4: Create one more dust coin to test the threshold
+    payees = []
+    payee_ph = await dust_wallet.get_new_puzzlehash()
+    payees.append(Payment(payee_ph, uint64(dust_value)))
+    # construct and send tx
+    [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
+    await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+    # advance the chain and sync both wallets
+    await full_node_api.wait_transaction_records_entered_mempool([tx])
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # Obtain and log important values
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
+    balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+    spendable_coins = await dust_wallet_node.wallet_state_manager.get_spendable_coins_for_wallet(1)
+    num_coins = len(spendable_coins)
+    log.info(f"Small coin count is {small_unspent_count}")
+    log.info(f"Wallet balance is {balance}")
+    log.info(f"Number of coins is {num_coins}")
+    # In the edge case where the new "dust" is larger than the threshold,
+    # then it is actually a large dust coin that won't get filtered.
+    if dust_value >= xch_spam_amount:
+        large_dust_coins += 1
+        large_dust_balance += dust_value
+    assert dust_coins == spam_filter_after_n_txs
+    assert balance == dust_coins * dust_value + large_coins * xch_spam_amount + large_dust_balance
+    assert num_coins == dust_coins + large_dust_coins + large_coins
+    # Part 5: Create 5 coins below the threshold and 5 at or above.
+    # Those below the threshold should get filtered, and those above should not.
+    payees = []
+    for i in range(5):
         payee_ph = await dust_wallet.get_new_puzzlehash()
-        payees.append(Payment(payee_ph, uint64(dust_value)))
-        # construct and send tx
-        [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
-        await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
-        # advance the chain and sync both wallets
-        await full_node_api.wait_transaction_records_entered_mempool([tx])
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        # Obtain and log important values
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
-        balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
-        num_coins: Optional[Message] = len(
-            list(await dust_wallet_node.wallet_state_manager.get_spendable_coins_for_wallet(1))
-        )
+        # Create a large coin and add on the appropriate balance.
+        payees.append(Payment(payee_ph, uint64(xch_spam_amount + i)))
+        large_coins += 1
+        large_coin_balance += xch_spam_amount + i
-        log.info(f"Small coin count is {small_unspent_count}")
-        log.info(f"Wallet balance is {balance}")
-        log.info(f"Number of coins is {num_coins}")
+        payee_ph = await dust_wallet.get_new_puzzlehash()
-        # In the edge case where the new "dust" is larger than the threshold,
-        # then it is actually a large dust coin that won't get filtered.
-        if dust_value >= xch_spam_amount:
+        # Make sure we are always creating coins with a positive value.
+        if xch_spam_amount - dust_value - i > 0:
+            payees.append(Payment(payee_ph, uint64(xch_spam_amount - dust_value - i)))
+        else:
+            payees.append(Payment(payee_ph, uint64(dust_value)))
+        # In cases where xch_spam_amount is sufficiently low,
+        # the new dust should be considered a large coina and not be filtered.
+        if xch_spam_amount <= dust_value:
             large_dust_coins += 1
             large_dust_balance += dust_value
-        assert dust_coins == spam_filter_after_n_txs
-        assert balance == dust_coins * dust_value + large_coins * xch_spam_amount + large_dust_balance
-        assert num_coins == dust_coins + large_dust_coins + large_coins
-        # Part 5: Create 5 coins below the threshold and 5 at or above.
-        # Those below the threshold should get filtered, and those above should not.
-        payees = []
-        for i in range(5):
-            payee_ph = await dust_wallet.get_new_puzzlehash()
+    # construct and send tx
+    [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
+    await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+    # advance the chain and sync both wallets
+    await full_node_api.wait_transaction_records_entered_mempool([tx])
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # Obtain and log important values
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
+    balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+    spendable_coins = await dust_wallet_node.wallet_state_manager.get_spendable_coins_for_wallet(1)
+    num_coins = len(spendable_coins)
+    log.info(f"Small coin count is {small_unspent_count}")
+    log.info(f"Wallet balance is {balance}")
+    log.info(f"Number of coins is {num_coins}")
+    # The filter should have automatically been activated by now, regardless of filter value
+    assert dust_coins == spam_filter_after_n_txs
+    assert balance == dust_coins * dust_value + large_coin_balance + large_dust_balance
+    assert num_coins == dust_coins + large_dust_coins + large_coins
+    # Part 6: Clear all coins from the dust wallet.
+    # Send to the dust wallet "spam_filter_after_n_txs" coins that are equal in value to "xch_spam_amount".
+    # Send 1 mojo from the dust wallet. The dust wallet should receive a change coin valued at "xch_spam_amount-1".
+    payee_ph = await farm_wallet.get_new_puzzlehash()
+    payees = [Payment(payee_ph, uint64(balance))]
+    # construct and send tx
+    [tx] = await dust_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
+    await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+    # advance the chain and sync both wallets
+    await full_node_api.wait_transaction_records_entered_mempool([tx])
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # Obtain and log important values
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    unspent_count = len(all_unspent)
+    balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+    # Make sure the dust wallet is empty
+    assert unspent_count == 0
+    assert balance == 0
+    # create the same number of dust coins as the filter
+    if spam_filter_after_n_txs > 0:
+        coins_remaining = spam_filter_after_n_txs
+    else:
+        # in the edge case, create one coin
+        coins_remaining = 1
+    # The size of the coin to send the dust wallet is the same as xch_spam_amount
+    if xch_spam_amount > 1:
+        coin_value = xch_spam_amount
+    else:
+        # Handle the edge case to make sure the coin is at least 2 mojos
+        # This is needed to receive change
+        coin_value = 2
+    while coins_remaining > 0:
+        payee_ph = await dust_wallet.get_new_puzzlehash()
+        payees.append(Payment(payee_ph, uint64(coin_value)))
-            # Create a large coin and add on the appropriate balance.
-            payees.append(Payment(payee_ph, uint64(xch_spam_amount + i)))
-            large_coins += 1
-            large_coin_balance += xch_spam_amount + i
+        # After every 100 (at most) coins added, push the tx and advance the chain
+        # This greatly speeds up the overall process
+        if coins_remaining % 100 == 0 and coins_remaining != spam_filter_after_n_txs:
+            # construct and send tx
+            [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
+            await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+            await full_node_api.wait_transaction_records_entered_mempool([tx])
+            await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+            await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+            # reset payees
+            payees = []
+        coins_remaining -= 1
+    # construct and send tx
+    [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
+    await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+    # advance the chain and sync both wallets
+    await full_node_api.wait_transaction_records_entered_mempool([tx])
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # Obtain and log important values
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    unspent_count = len(all_unspent)
+    balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+    # Verify the number of coins and value
+    if spam_filter_after_n_txs > 0:
+        assert unspent_count == spam_filter_after_n_txs
+    else:
+        # in the edge case there should be 1 coin
+        assert unspent_count == 1
+    assert balance == unspent_count * coin_value
+    # Send a 1 mojo coin from the dust wallet to the farm wallet
+    payee_ph = await farm_wallet.get_new_puzzlehash()
+    payees = [Payment(payee_ph, uint64(1))]
+    # construct and send tx
+    [tx] = await dust_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
+    await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+    # advance the chain and sync both wallets
+    await full_node_api.wait_transaction_records_entered_mempool([tx])
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # Obtain and log important values
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    unspent_count = len(all_unspent)
+    balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+    # Make sure the dust wallet received a change coin worth 1 mojo less than the original coin size
+    if spam_filter_after_n_txs > 0:
+        assert unspent_count == spam_filter_after_n_txs
+    else:
+        # in the edge case there should be 1 coin
+        assert unspent_count == 1
+    assert balance == (unspent_count * coin_value) - 1
+    # Part 7: Create NFT wallets for the farmer and dust wallets.
+    #         Generate an NFT in the farmer wallet.
+    #         Send the NFT to the dust wallet, which already has enough coins to trigger the dust filter.
+    #         The NFT should not be filtered.
+    # Start with new puzzlehashes for each wallet
+    farm_ph = await farm_wallet.get_new_puzzlehash()
+    dust_ph = await dust_wallet.get_new_puzzlehash()
+    # Create an NFT wallet for the farmer and dust wallet
+    farm_nft_wallet = await NFTWallet.create_new_nft_wallet(
+        farm_wallet_node.wallet_state_manager, farm_wallet, name="FARM NFT WALLET"
+    )
+    dust_nft_wallet = await NFTWallet.create_new_nft_wallet(
+        dust_wallet_node.wallet_state_manager, dust_wallet, name="DUST NFT WALLET"
+    )
-            payee_ph = await dust_wallet.get_new_puzzlehash()
+    # Create a new NFT and send it to the farmer's NFT wallet
+    metadata = Program.to(
+        [
+            ("u", ["https://www.chia.net/img/branding/chia-logo.svg"]),
+            ("h", "0xD4584AD463139FA8C0D9F68F4B59F185"),
+        ]
+    )
+    txs = await farm_nft_wallet.generate_new_nft(metadata, DEFAULT_TX_CONFIG)
+    txs = await farm_nft_wallet.wallet_state_manager.add_pending_transactions(txs)
+    for tx in txs:
+        if tx.spend_bundle is not None:
+            assert compute_memos(tx.spend_bundle)
+            await time_out_assert_not_none(
+                20, full_node_api.full_node.mempool_manager.get_spendbundle, tx.spend_bundle.name()
+            )
-            # Make sure we are always creating coins with a positive value.
-            if xch_spam_amount - dust_value - i > 0:
-                payees.append(Payment(payee_ph, uint64(xch_spam_amount - dust_value - i)))
+    # Farm a new block
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(farm_ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # Make sure the dust wallet has enough unspent coins in that the next coin would be filtered
+    # if it were a normal dust coin (and not an NFT)
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    unspent_count = len(all_unspent)
+    assert unspent_count >= spam_filter_after_n_txs
+    # Make sure the NFT is in the farmer's NFT wallet, and the dust NFT wallet is empty
+    await time_out_assert(15, get_nft_count, 1, farm_nft_wallet)
+    await time_out_assert(15, get_nft_count, 0, dust_nft_wallet)
+    nft_coins = await farm_nft_wallet.get_current_nfts()
+    # Send the NFT to the dust wallet
+    txs = await farm_nft_wallet.generate_signed_transaction(
+        [uint64(nft_coins[0].coin.amount)],
+        [dust_ph],
+        DEFAULT_TX_CONFIG,
+        coins={nft_coins[0].coin},
+    )
+    assert len(txs) == 1
+    assert txs[0].spend_bundle is not None
+    await farm_wallet_node.wallet_state_manager.add_pending_transactions(txs)
+    assert compute_memos(txs[0].spend_bundle)
+    # Farm a new block.
+    await full_node_api.wait_transaction_records_entered_mempool(txs)
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(farm_ph))
+    await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    # Make sure the dust wallet has enough unspent coins in that the next coin would be filtered
+    # if it were a normal dust coin (and not an NFT)
+    all_unspent: Set[WalletCoinRecord] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
+    unspent_count = len(all_unspent)
+    assert unspent_count >= spam_filter_after_n_txs
+    # The dust wallet should now hold the NFT. It should not be filtered
+    await time_out_assert(15, get_nft_count, 0, farm_nft_wallet)
+    await time_out_assert(15, get_nft_count, 1, dust_nft_wallet)
+@pytest.mark.anyio
+async def test_retry_store(two_wallet_nodes, self_hostname):
+    full_nodes, wallets, bt = two_wallet_nodes
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
+    await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32([0] * 32)))
+    # Trusted node sync
+    wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
+    # Untrusted node sync
+    wallets[1][0].config["trusted_peers"] = {}
+    def flaky_get_coin_state(node, func):
+        async def new_func(*args, **kwargs):
+            if node.coin_state_flaky:
+                node.coin_state_flaky = False
+                raise PeerRequestException()
             else:
-                payees.append(Payment(payee_ph, uint64(dust_value)))
-            # In cases where xch_spam_amount is sufficiently low,
-            # the new dust should be considered a large coina and not be filtered.
-            if xch_spam_amount <= dust_value:
-                large_dust_coins += 1
-                large_dust_balance += dust_value
-        # construct and send tx
-        [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
-        await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+                return await func(*args, **kwargs)
-        # advance the chain and sync both wallets
-        await full_node_api.wait_transaction_records_entered_mempool([tx])
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        # Obtain and log important values
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        small_unspent_count = len([r for r in all_unspent if r.coin.amount < xch_spam_amount])
-        balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
-        num_coins: Optional[Message] = len(
-            list(await dust_wallet_node.wallet_state_manager.get_spendable_coins_for_wallet(1))
-        )
-        log.info(f"Small coin count is {small_unspent_count}")
-        log.info(f"Wallet balance is {balance}")
-        log.info(f"Number of coins is {num_coins}")
-        # The filter should have automatically been activated by now, regardless of filter value
-        assert dust_coins == spam_filter_after_n_txs
-        assert balance == dust_coins * dust_value + large_coin_balance + large_dust_balance
-        assert num_coins == dust_coins + large_dust_coins + large_coins
-        # Part 6: Clear all coins from the dust wallet.
-        # Send to the dust wallet "spam_filter_after_n_txs" coins that are equal in value to "xch_spam_amount".
-        # Send 1 mojo from the dust wallet. The dust wallet should receive a change coin valued at "xch_spam_amount-1".
-        payee_ph = await farm_wallet.get_new_puzzlehash()
-        payees = [Payment(payee_ph, uint64(balance))]
-        # construct and send tx
-        [tx] = await dust_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
-        await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+        return new_func
-        # advance the chain and sync both wallets
-        await full_node_api.wait_transaction_records_entered_mempool([tx])
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        # Obtain and log important values
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        unspent_count = len([r for r in all_unspent])
-        balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
-        # Make sure the dust wallet is empty
-        assert unspent_count == 0
-        assert balance == 0
-        # create the same number of dust coins as the filter
-        if spam_filter_after_n_txs > 0:
-            coins_remaining = spam_filter_after_n_txs
-        else:
-            # in the edge case, create one coin
-            coins_remaining = 1
-        # The size of the coin to send the dust wallet is the same as xch_spam_amount
-        if xch_spam_amount > 1:
-            coin_value = xch_spam_amount
-        else:
-            # Handle the edge case to make sure the coin is at least 2 mojos
-            # This is needed to receive change
-            coin_value = 2
-        while coins_remaining > 0:
-            payee_ph = await dust_wallet.get_new_puzzlehash()
-            payees.append(Payment(payee_ph, uint64(coin_value)))
-            # After every 100 (at most) coins added, push the tx and advance the chain
-            # This greatly speeds up the overall process
-            if coins_remaining % 100 == 0 and coins_remaining != spam_filter_after_n_txs:
-                # construct and send tx
-                [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
-                await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
-                await full_node_api.wait_transaction_records_entered_mempool([tx])
-                await full_node_api.wait_for_wallets_synced(
-                    wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20
-                )
-                await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-                await full_node_api.wait_for_wallets_synced(
-                    wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20
-                )
-                # reset payees
-                payees = []
-            coins_remaining -= 1
-        # construct and send tx
-        [tx] = await farm_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
-        await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+    request_puzzle_solution_failure_tested = False
-        # advance the chain and sync both wallets
-        await full_node_api.wait_transaction_records_entered_mempool([tx])
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    def flaky_request_puzzle_solution(func):
+        @functools.wraps(func)
+        async def new_func(*args, **kwargs):
+            nonlocal request_puzzle_solution_failure_tested
+            if not request_puzzle_solution_failure_tested:
+                request_puzzle_solution_failure_tested = True
+                # This can just return None if we have `none_response` enabled.
+                reject = wallet_protocol.RejectPuzzleSolution(bytes32([0] * 32), uint32(0))
+                return make_msg(ProtocolMessageTypes.reject_puzzle_solution, reject)
+            else:
+                return await func(*args, **kwargs)
-        # Obtain and log important values
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        unspent_count = len([r for r in all_unspent])
-        balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+        return new_func
-        # Verify the number of coins and value
-        if spam_filter_after_n_txs > 0:
-            assert unspent_count == spam_filter_after_n_txs
-        else:
-            # in the edge case there should be 1 coin
-            assert unspent_count == 1
-        assert balance == unspent_count * coin_value
+    def flaky_fetch_children(node, func):
+        async def new_func(*args, **kwargs):
+            if node.fetch_children_flaky:
+                node.fetch_children_flaky = False
+                raise PeerRequestException()
+            else:
+                return await func(*args, **kwargs)
-        # Send a 1 mojo coin from the dust wallet to the farm wallet
-        payee_ph = await farm_wallet.get_new_puzzlehash()
-        payees = [Payment(payee_ph, uint64(1))]
+        return new_func
-        # construct and send tx
-        [tx] = await dust_wallet.generate_signed_transaction(uint64(0), ph, DEFAULT_TX_CONFIG, primaries=payees)
-        await full_node_api.send_transaction(SendTransaction(tx.spend_bundle))
+    def flaky_get_timestamp(node, func):
+        async def new_func(*args, **kwargs):
+            if node.get_timestamp_flaky:
+                node.get_timestamp_flaky = False
+                raise PeerRequestException()
+            else:
+                return await func(*args, **kwargs)
-        # advance the chain and sync both wallets
-        await full_node_api.wait_transaction_records_entered_mempool([tx])
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+        return new_func
-        # Obtain and log important values
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        unspent_count = len([r for r in all_unspent])
-        balance: Optional[Message] = await dust_wallet.get_confirmed_balance()
+    def flaky_info_for_puzhash(node, func):
+        async def new_func(*args, **kwargs):
+            if node.db_flaky:
+                node.db_flaky = False
+                raise AIOSqliteError()
+            else:
+                return await func(*args, **kwargs)
-        # Make sure the dust wallet received a change coin worth 1 mojo less than the original coin size
-        if spam_filter_after_n_txs > 0:
-            assert unspent_count == spam_filter_after_n_txs
-        else:
-            # in the edge case there should be 1 coin
-            assert unspent_count == 1
-        assert balance == (unspent_count * coin_value) - 1
-        # Part 7: Create NFT wallets for the farmer and dust wallets.
-        #         Generate an NFT in the farmer wallet.
-        #         Send the NFT to the dust wallet, which already has enough coins to trigger the dust filter.
-        #         The NFT should not be filtered.
-        # Start with new puzzlehashes for each wallet
-        farm_ph = await farm_wallet.get_new_puzzlehash()
-        dust_ph = await dust_wallet.get_new_puzzlehash()
-        # Create an NFT wallet for the farmer and dust wallet
-        farm_nft_wallet = await NFTWallet.create_new_nft_wallet(
-            farm_wallet_node.wallet_state_manager, farm_wallet, name="FARM NFT WALLET"
-        )
-        dust_nft_wallet = await NFTWallet.create_new_nft_wallet(
-            dust_wallet_node.wallet_state_manager, dust_wallet, name="DUST NFT WALLET"
-        )
+        return new_func
-        # Create a new NFT and send it to the farmer's NFT wallet
-        metadata = Program.to(
-            [
-                ("u", ["https://www.chia.net/img/branding/chia-logo.svg"]),
-                ("h", "0xD4584AD463139FA8C0D9F68F4B59F185"),
-            ]
-        )
-        txs = await farm_nft_wallet.generate_new_nft(metadata, DEFAULT_TX_CONFIG)
-        await farm_nft_wallet.wallet_state_manager.add_pending_transactions(txs)
-        for tx in txs:
-            if tx.spend_bundle is not None:
-                assert compute_memos(tx.spend_bundle)
-                await time_out_assert_not_none(
-                    20, full_node_api.full_node.mempool_manager.get_spendbundle, tx.spend_bundle.name()
-                )
-        # Farm a new block
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(farm_ph))
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
+    full_node_api.request_puzzle_solution = flaky_request_puzzle_solution(full_node_api.request_puzzle_solution)
-        # Make sure the dust wallet has enough unspent coins in that the next coin would be filtered
-        # if it were a normal dust coin (and not an NFT)
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        unspent_count = len([r for r in all_unspent])
-        assert unspent_count >= spam_filter_after_n_txs
-        # Make sure the NFT is in the farmer's NFT wallet, and the dust NFT wallet is empty
-        await time_out_assert(15, get_nft_count, 1, farm_nft_wallet)
-        await time_out_assert(15, get_nft_count, 0, dust_nft_wallet)
-        nft_coins = await farm_nft_wallet.get_current_nfts()
-        # Send the NFT to the dust wallet
-        txs = await farm_nft_wallet.generate_signed_transaction(
-            [uint64(nft_coins[0].coin.amount)],
-            [dust_ph],
-            DEFAULT_TX_CONFIG,
-            coins={nft_coins[0].coin},
+    for wallet_node, wallet_server in wallets:
+        wallet_node.coin_state_retry_seconds = 1
+        request_puzzle_solution_failure_tested = False
+        wallet_node.coin_state_flaky = True
+        wallet_node.fetch_children_flaky = True
+        wallet_node.get_timestamp_flaky = True
+        wallet_node.db_flaky = True
+        wallet_node.get_coin_state = flaky_get_coin_state(wallet_node, wallet_node.get_coin_state)
+        wallet_node.fetch_children = flaky_fetch_children(wallet_node, wallet_node.fetch_children)
+        wallet_node.get_timestamp_for_height = flaky_get_timestamp(wallet_node, wallet_node.get_timestamp_for_height)
+        wallet_node.wallet_state_manager.puzzle_store.get_wallet_identifier_for_puzzle_hash = flaky_info_for_puzhash(
+            wallet_node, wallet_node.wallet_state_manager.puzzle_store.get_wallet_identifier_for_puzzle_hash
         )
-        assert len(txs) == 1
-        assert txs[0].spend_bundle is not None
-        await farm_wallet_node.wallet_state_manager.add_pending_transactions(txs)
-        assert compute_memos(txs[0].spend_bundle)
-        # Farm a new block.
-        await full_node_api.wait_transaction_records_entered_mempool(txs)
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(farm_ph))
-        await full_node_api.wait_for_wallets_synced(wallet_nodes=[farm_wallet_node, dust_wallet_node], timeout=20)
-        # Make sure the dust wallet has enough unspent coins in that the next coin would be filtered
-        # if it were a normal dust coin (and not an NFT)
-        all_unspent: Set[
-            WalletCoinRecord
-        ] = await dust_wallet_node.wallet_state_manager.coin_store.get_all_unspent_coins()
-        unspent_count = len([r for r in all_unspent])
-        assert unspent_count >= spam_filter_after_n_txs
-        # The dust wallet should now hold the NFT. It should not be filtered
-        await time_out_assert(15, get_nft_count, 0, farm_nft_wallet)
-        await time_out_assert(15, get_nft_count, 1, dust_nft_wallet)
-    @pytest.mark.anyio
-    async def test_retry_store(self, two_wallet_nodes, self_hostname):
-        full_nodes, wallets, bt = two_wallet_nodes
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
+        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+        wallet = wallet_node.wallet_state_manager.main_wallet
+        ph = await wallet.get_new_puzzlehash()
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
         await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32([0] * 32)))
-        # Trusted node sync
-        wallets[0][0].config["trusted_peers"] = {full_node_server.node_id.hex(): full_node_server.node_id.hex()}
-        # Untrusted node sync
-        wallets[1][0].config["trusted_peers"] = {}
+        async def retry_store_empty() -> bool:
+            return len(await wallet_node.wallet_state_manager.retry_store.get_all_states_to_retry()) == 0
-        def flaky_get_coin_state(node, func):
-            async def new_func(*args, **kwargs):
-                if node.coin_state_flaky:
-                    node.coin_state_flaky = False
-                    raise PeerRequestException()
-                else:
-                    return await func(*args, **kwargs)
+        async def assert_coin_state_retry() -> None:
+            # Wait for retry coin states to show up
+            await time_out_assert(15, retry_store_empty, False)
+            # And become retried/removed
+            await time_out_assert(30, retry_store_empty, True)
-            return new_func
-        request_puzzle_solution_failure_tested = False
-        def flaky_request_puzzle_solution(func):
-            @functools.wraps(func)
-            async def new_func(*args, **kwargs):
-                nonlocal request_puzzle_solution_failure_tested
-                if not request_puzzle_solution_failure_tested:
-                    request_puzzle_solution_failure_tested = True
-                    # This can just return None if we have `none_response` enabled.
-                    reject = wallet_protocol.RejectPuzzleSolution(bytes32([0] * 32), uint32(0))
-                    return make_msg(ProtocolMessageTypes.reject_puzzle_solution, reject)
-                else:
-                    return await func(*args, **kwargs)
-            return new_func
-        def flaky_fetch_children(node, func):
-            async def new_func(*args, **kwargs):
-                if node.fetch_children_flaky:
-                    node.fetch_children_flaky = False
-                    raise PeerRequestException()
-                else:
-                    return await func(*args, **kwargs)
-            return new_func
-        def flaky_get_timestamp(node, func):
-            async def new_func(*args, **kwargs):
-                if node.get_timestamp_flaky:
-                    node.get_timestamp_flaky = False
-                    raise PeerRequestException()
-                else:
-                    return await func(*args, **kwargs)
-            return new_func
-        def flaky_info_for_puzhash(node, func):
-            async def new_func(*args, **kwargs):
-                if node.db_flaky:
-                    node.db_flaky = False
-                    raise AIOSqliteError()
-                else:
-                    return await func(*args, **kwargs)
-            return new_func
-        full_node_api.request_puzzle_solution = flaky_request_puzzle_solution(full_node_api.request_puzzle_solution)
-        for wallet_node, wallet_server in wallets:
-            wallet_node.coin_state_retry_seconds = 1
-            request_puzzle_solution_failure_tested = False
-            wallet_node.coin_state_flaky = True
-            wallet_node.fetch_children_flaky = True
-            wallet_node.get_timestamp_flaky = True
-            wallet_node.db_flaky = True
-            wallet_node.get_coin_state = flaky_get_coin_state(wallet_node, wallet_node.get_coin_state)
-            wallet_node.fetch_children = flaky_fetch_children(wallet_node, wallet_node.fetch_children)
-            wallet_node.get_timestamp_for_height = flaky_get_timestamp(
-                wallet_node, wallet_node.get_timestamp_for_height
-            )
-            wallet_node.wallet_state_manager.puzzle_store.get_wallet_identifier_for_puzzle_hash = (
-                flaky_info_for_puzhash(
-                    wallet_node, wallet_node.wallet_state_manager.puzzle_store.get_wallet_identifier_for_puzzle_hash
-                )
-            )
+        await assert_coin_state_retry()
-            await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+        await time_out_assert(30, wallet.get_confirmed_balance, 2_000_000_000_000)
-            wallet = wallet_node.wallet_state_manager.main_wallet
-            ph = await wallet.get_new_puzzlehash()
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(ph))
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32([0] * 32)))
-            async def retry_store_empty() -> bool:
-                return len(await wallet_node.wallet_state_manager.retry_store.get_all_states_to_retry()) == 0
-            async def assert_coin_state_retry() -> None:
-                # Wait for retry coin states to show up
-                await time_out_assert(15, retry_store_empty, False)
-                # And become retried/removed
-                await time_out_assert(30, retry_store_empty, True)
-            await assert_coin_state_retry()
-            await time_out_assert(30, wallet.get_confirmed_balance, 2_000_000_000_000)
-            [tx] = await wallet.generate_signed_transaction(
-                1_000_000_000_000, bytes32([0] * 32), DEFAULT_TX_CONFIG, memos=[ph]
-            )
-            await wallet_node.wallet_state_manager.add_pending_transactions([tx])
-            async def tx_in_mempool():
-                return full_node_api.full_node.mempool_manager.get_spendbundle(tx.name) is not None
-            await time_out_assert(15, tx_in_mempool)
-            await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32([0] * 32)))
-            await assert_coin_state_retry()
-            assert not wallet_node.coin_state_flaky
-            assert request_puzzle_solution_failure_tested
-            assert not wallet_node.fetch_children_flaky
-            assert not wallet_node.get_timestamp_flaky
-            assert not wallet_node.db_flaky
-            await time_out_assert(30, wallet.get_confirmed_balance, 1_000_000_000_000)
-    @pytest.mark.limit_consensus_modes(reason="save time")
-    @pytest.mark.anyio
-    async def test_bad_peak_mismatch(self, two_wallet_nodes, default_1000_blocks, self_hostname, blockchain_constants):
-        full_nodes, wallets, bt = two_wallet_nodes
-        wallet_node, wallet_server = wallets[0]
-        full_node_api = full_nodes[0]
-        full_node_server = full_node_api.full_node.server
-        blocks = default_1000_blocks
-        header_cache, height_to_hash, sub_blocks, summaries = await load_blocks_dont_validate(
-            blocks, blockchain_constants
+        [tx] = await wallet.generate_signed_transaction(
+            1_000_000_000_000, bytes32([0] * 32), DEFAULT_TX_CONFIG, memos=[ph]
         )
-        wpf = WeightProofHandler(blockchain_constants, BlockCache(sub_blocks, header_cache, height_to_hash, summaries))
+        await wallet_node.wallet_state_manager.add_pending_transactions([tx])
-        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
-        for block in blocks:
-            await full_node_api.full_node.add_block(block)
+        async def tx_in_mempool():
+            return full_node_api.full_node.mempool_manager.get_spendbundle(tx.name) is not None
-        await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+        await time_out_assert(15, tx_in_mempool)
+        await full_node_api.farm_new_transaction_block(FarmNewBlockProtocol(bytes32([0] * 32)))
-        # make wp for lower height
-        wp = await wpf.get_proof_of_weight(height_to_hash[800])
-        # create the node respond with the lighter proof
-        wp_msg = make_msg(
-            ProtocolMessageTypes.respond_proof_of_weight,
-            full_node_protocol.RespondProofOfWeight(wp, wp.recent_chain_data[-1].header_hash),
-        )
+        await assert_coin_state_retry()
+        assert not wallet_node.coin_state_flaky
+        assert request_puzzle_solution_failure_tested
+        assert not wallet_node.fetch_children_flaky
+        assert not wallet_node.get_timestamp_flaky
+        assert not wallet_node.db_flaky
+        await time_out_assert(30, wallet.get_confirmed_balance, 1_000_000_000_000)
+@pytest.mark.limit_consensus_modes(reason="save time")
+@pytest.mark.anyio
+async def test_bad_peak_mismatch(
+    two_wallet_nodes, default_1000_blocks, self_hostname, blockchain_constants, monkeypatch
+):
+    full_nodes, wallets, bt = two_wallet_nodes
+    wallet_node, wallet_server = wallets[0]
+    full_node_api = full_nodes[0]
+    full_node_server = full_node_api.full_node.server
+    blocks = default_1000_blocks
+    header_cache, height_to_hash, sub_blocks, summaries = await load_blocks_dont_validate(blocks, blockchain_constants)
+    wpf = WeightProofHandler(blockchain_constants, BlockCache(sub_blocks, header_cache, height_to_hash, summaries))
+    await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    for block in blocks:
+        await full_node_api.full_node.add_block(block)
+    await wallet_server.start_client(PeerInfo(self_hostname, full_node_server.get_port()), None)
+    # make wp for lower height
+    wp = await wpf.get_proof_of_weight(height_to_hash[800])
+    # create the node respond with the lighter proof
+    wp_msg = make_msg(
+        ProtocolMessageTypes.respond_proof_of_weight,
+        full_node_protocol.RespondProofOfWeight(wp, wp.recent_chain_data[-1].header_hash),
+    )
+    with monkeypatch.context() as m:
         f = asyncio.Future()
         f.set_result(wp_msg)
-        full_node_api.request_proof_of_weight = MagicMock(return_value=f)
+        m.setattr(full_node_api, "request_proof_of_weight", MagicMock(return_value=f))
         # create the node respond with the lighter header block
         header_block_msg = make_msg(
         @@@ -1347,7 -1347,7 +1291,7 @@@
         )
         f2 = asyncio.Future()
         f2.set_result(header_block_msg)
-        full_node_api.request_block_header = MagicMock(return_value=f2)
+        m.setattr(full_node_api, "request_block_header", MagicMock(return_value=f2))
         # create new fake peak msg
         fake_peak_height = uint32(11000)

tests/wallet/test_bech32m.py CHANGED Viewed

         @@@ -6,7 -6,7 +6,7 @@@ from __future__ import annotation
 from chia.util.bech32m import bech32_decode
-def test_valid_imports():
+def test_valid_imports() -> None:
     test_strings = [
         "A1LQFN3A",
         "a1lqfn3a",
         @@@ -18,11 -18,11 +18,11 @@@
         "?1v759aa",
     ]
     for test_str in test_strings:
-        hrp, data = bech32_decode(test_str)
+        _, data = bech32_decode(test_str)
         assert data is not None
-def test_invalid_imports():
+def test_invalid_imports() -> None:
     test_strings = [
         f"{0x20}1xj0phk",
         f"{0x7F}1g6xzxy",
         @@@ -41,5 -41,5 +41,5 @@@
         "1p2gdwpf",
     ]
     for test_str in test_strings:
-        hrp, data = bech32_decode(test_str)
+        _, data = bech32_decode(test_str)
         assert data is None

tests/wallet/test_puzzle_store.py CHANGED Viewed

         @@@ -42,61 -42,61 +42,60 @@@ class DummyDerivationRecords
             self.index_per_wallet[wallet_id] += 1
-class TestPuzzleStore:
-    @pytest.mark.anyio
-    async def test_puzzle_store(self, seeded_random: random.Random):
-        async with DBConnection(1) as wrapper:
-            db = await WalletPuzzleStore.create(wrapper)
-            derivation_recs = []
-            for i in range(1000):
-                derivation_recs.append(
-                    DerivationRecord(
-                        uint32(i),
-                        bytes32.random(seeded_random),
-                        AugSchemeMPL.key_gen(bytes32.random(seeded_random)).get_g1(),
-                        WalletType.STANDARD_WALLET,
-                        uint32(1),
-                        False,
-                    )
+@pytest.mark.anyio
+async def test_puzzle_store(seeded_random: random.Random) -> None:
+    async with DBConnection(1) as wrapper:
+        db = await WalletPuzzleStore.create(wrapper)
+        derivation_recs = []
+        for i in range(1000):
+            derivation_recs.append(
+                DerivationRecord(
+                    uint32(i),
+                    bytes32.random(seeded_random),
+                    AugSchemeMPL.key_gen(bytes32.random(seeded_random)).get_g1(),
+                    WalletType.STANDARD_WALLET,
+                    uint32(1),
+                    False,
                 )
-                derivation_recs.append(
-                    DerivationRecord(
-                        uint32(i),
-                        bytes32.random(seeded_random),
-                        AugSchemeMPL.key_gen(bytes32.random(seeded_random)).get_g1(),
-                        WalletType.CAT,
-                        uint32(2),
-                        False,
-                    )
+            )
+            derivation_recs.append(
+                DerivationRecord(
+                    uint32(i),
+                    bytes32.random(seeded_random),
+                    AugSchemeMPL.key_gen(bytes32.random(seeded_random)).get_g1(),
+                    WalletType.CAT,
+                    uint32(2),
+                    False,
                 )
-            assert await db.puzzle_hash_exists(derivation_recs[0].puzzle_hash) is False
-            assert await db.index_for_pubkey(derivation_recs[0].pubkey) is None
-            assert await db.index_for_puzzle_hash(derivation_recs[2].puzzle_hash) is None
-            assert await db.get_wallet_identifier_for_puzzle_hash(derivation_recs[2].puzzle_hash) is None
-            assert len(await db.get_all_puzzle_hashes()) == 0
-            assert await db.get_last_derivation_path() is None
-            assert await db.get_unused_derivation_path() is None
-            assert await db.get_derivation_record(0, 2, False) is None
-            await db.add_derivation_paths(derivation_recs)
-            assert await db.puzzle_hash_exists(derivation_recs[0].puzzle_hash) is True
-            assert await db.index_for_pubkey(derivation_recs[4].pubkey) == 2
-            assert await db.index_for_puzzle_hash(derivation_recs[2].puzzle_hash) == 1
-            assert await db.get_wallet_identifier_for_puzzle_hash(derivation_recs[2].puzzle_hash) == WalletIdentifier(
-                derivation_recs[2].wallet_id,
-                derivation_recs[2].wallet_type,
             )
-            assert len(await db.get_all_puzzle_hashes()) == 2000
-            assert await db.get_last_derivation_path() == 999
-            assert await db.get_unused_derivation_path() == 0
-            assert await db.get_derivation_record(0, 2, False) == derivation_recs[1]
-            # Indeces up to 250
-            await db.set_used_up_to(249)
-            assert await db.get_unused_derivation_path() == 250
+        assert await db.puzzle_hash_exists(derivation_recs[0].puzzle_hash) is False
+        assert await db.index_for_pubkey(derivation_recs[0].pubkey) is None
+        assert await db.index_for_puzzle_hash(derivation_recs[2].puzzle_hash) is None
+        assert await db.get_wallet_identifier_for_puzzle_hash(derivation_recs[2].puzzle_hash) is None
+        assert len(await db.get_all_puzzle_hashes()) == 0
+        assert await db.get_last_derivation_path() is None
+        assert await db.get_unused_derivation_path() is None
+        assert await db.get_derivation_record(0, 2, False) is None
+        await db.add_derivation_paths(derivation_recs)
+        assert await db.puzzle_hash_exists(derivation_recs[0].puzzle_hash) is True
+        assert await db.index_for_pubkey(derivation_recs[4].pubkey) == 2
+        assert await db.index_for_puzzle_hash(derivation_recs[2].puzzle_hash) == 1
+        assert await db.get_wallet_identifier_for_puzzle_hash(derivation_recs[2].puzzle_hash) == WalletIdentifier(
+            derivation_recs[2].wallet_id,
+            derivation_recs[2].wallet_type,
+        )
+        assert len(await db.get_all_puzzle_hashes()) == 2000
+        assert await db.get_last_derivation_path() == 999
+        assert await db.get_unused_derivation_path() == 0
+        assert await db.get_derivation_record(0, 2, False) == derivation_recs[1]
+        # Indeces up to 250
+        await db.set_used_up_to(249)
+        assert await db.get_unused_derivation_path() == 250
 @pytest.mark.anyio

tests/wallet/test_singleton.py CHANGED Viewed

         @@@ -38,14 -38,14 +38,14 @@@ def p2_singleton_puzzle_hash(launcher_i
     return p2_singleton_puzzle(launcher_id, launcher_puzzle_hash).get_tree_hash()
-def test_only_odd_coins():
+def test_only_odd_coins() -> None:
     singleton_mod_hash = SINGLETON_MOD.get_tree_hash()
     # (SINGLETON_STRUCT INNER_PUZZLE lineage_proof my_amount inner_solution)
     # SINGLETON_STRUCT = (MOD_HASH . (LAUNCHER_ID . LAUNCHER_PUZZLE_HASH))
     solution = Program.to(
         [
             (singleton_mod_hash, (LAUNCHER_ID, LAUNCHER_PUZZLE_HASH)),
-            Program.to(binutils.assemble("(q (51 0xcafef00d 200))")),
+            Program.to(binutils.assemble("(q (51 0xcafef00d 200))")),  # type: ignore[no-untyped-call]
             [0xDEADBEEF, 0xCAFEF00D, 200],
             200,
             [],
         @@@ -53,27 -53,27 +53,28 @@@
     )
     with pytest.raises(Exception) as exception_info:
-        cost, result = SINGLETON_MOD.run_with_cost(INFINITE_COST, solution)
+        SINGLETON_MOD.run_with_cost(INFINITE_COST, solution)
     assert exception_info.value.args == ("clvm raise", "80")
     solution = Program.to(
         [
             (singleton_mod_hash, (LAUNCHER_ID, LAUNCHER_PUZZLE_HASH)),
-            Program.to(binutils.assemble("(q (51 0xcafef00d 201))")),
+            Program.to(binutils.assemble("(q (51 0xcafef00d 201))")),  # type: ignore[no-untyped-call]
             [0xDEADBEEF, 0xCAFED00D, 210],
             205,
             0,
         ]
     )
-    cost, result = SINGLETON_MOD.run_with_cost(INFINITE_COST, solution)
+    SINGLETON_MOD.run_with_cost(INFINITE_COST, solution)
-def test_only_one_odd_coin_created():
+def test_only_one_odd_coin_created() -> None:
     singleton_mod_hash = SINGLETON_MOD.get_tree_hash()
+    clsp = "(q (51 0xcafef00d 203) (51 0xfadeddab 205))"
     solution = Program.to(
         [
             (singleton_mod_hash, (LAUNCHER_ID, LAUNCHER_PUZZLE_HASH)),
-            Program.to(binutils.assemble("(q (51 0xcafef00d 203) (51 0xfadeddab 205))")),
+            Program.to(binutils.assemble(clsp)),  # type: ignore[no-untyped-call]
             [0xDEADBEEF, 0xCAFEF00D, 411],
             411,
             [],
         @@@ -81,22 -81,22 +82,22 @@@
     )
     with pytest.raises(Exception) as exception_info:
-        cost, result = SINGLETON_MOD.run_with_cost(INFINITE_COST, solution)
+        SINGLETON_MOD.run_with_cost(INFINITE_COST, solution)
     assert exception_info.value.args == ("clvm raise", "80")
+    clsp = "(q (51 0xcafef00d 203) (51 0xfadeddab 204) (51 0xdeadbeef 202))"
     solution = Program.to(
         [
             (singleton_mod_hash, (LAUNCHER_ID, LAUNCHER_PUZZLE_HASH)),
-            Program.to(binutils.assemble("(q (51 0xcafef00d 203) (51 0xfadeddab 204) (51 0xdeadbeef 202))")),
+            Program.to(binutils.assemble(clsp)),  # type: ignore[no-untyped-call]
             [0xDEADBEEF, 0xCAFEF00D, 411],
             411,
             [],
         ]
     )
-    cost, result = SINGLETON_MOD.run_with_cost(INFINITE_COST, solution)
+    SINGLETON_MOD.run_with_cost(INFINITE_COST, solution)
-def test_p2_singleton():
+def test_p2_singleton() -> None:
     # create a singleton. This should call driver code.
     launcher_id = LAUNCHER_ID
     innerpuz = Program.to(1)
         @@@ -111,11 -111,11 +112,11 @@@
     # create a `p2_singleton` puzzle. This should call driver code.
     p2_singleton_full = p2_singleton_puzzle(launcher_id, LAUNCHER_PUZZLE_HASH)
     solution = Program.to([innerpuz.get_tree_hash(), p2_singleton_coin_id])
-    cost, result = p2_singleton_full.run_with_cost(INFINITE_COST, solution)
+    _, result = p2_singleton_full.run_with_cost(INFINITE_COST, solution)
     conditions = parse_sexp_to_conditions(result)
     p2_singleton_full = p2_singleton_puzzle(launcher_id, LAUNCHER_PUZZLE_HASH)
     solution = Program.to([innerpuz.get_tree_hash(), p2_singleton_coin_id])
-    cost, result = p2_singleton_full.run_with_cost(INFINITE_COST, solution)
+    _, result = p2_singleton_full.run_with_cost(INFINITE_COST, solution)
     assert result.first().rest().first().as_atom() == expected_announcement
     assert conditions[0].vars[0] == expected_announcement

tests/wallet/test_singleton_lifecycle.py CHANGED Viewed

         @@@ -47,7 -47,7 +47,7 @@@ def launcher_conditions_and_spend_bundl
     initial_singleton_inner_puzzle: Program,
     metadata: List[Tuple[str, str]],
     launcher_puzzle: Program = LAUNCHER_PUZZLE,
-) -> Tuple[Program, bytes32, List[Program], SpendBundle]:
+) -> Tuple[bytes32, List[Program], SpendBundle]:
     launcher_puzzle_hash = launcher_puzzle.get_tree_hash()
     launcher_coin = Coin(parent_coin_id, launcher_puzzle_hash, launcher_amount)
     singleton_full_puzzle = SINGLETON_MOD.curry(
         @@@ -74,8 -74,8 +74,7 @@@
     launcher_solution = Program.to([singleton_full_puzzle_hash, launcher_amount, metadata])
     coin_spend = make_spend(launcher_coin, launcher_puzzle, launcher_solution)
     spend_bundle = SpendBundle([coin_spend], G2Element())
-    lineage_proof = Program.to([parent_coin_id, launcher_amount])
-    return lineage_proof, launcher_coin.name(), expected_conditions, spend_bundle
+    return launcher_coin.name(), expected_conditions, spend_bundle
 def singleton_puzzle(launcher_id: Program, launcher_puzzle_hash: bytes32, inner_puzzle: Program) -> Program:
         @@@ -109,7 -109,7 +108,7 @@@ async def test_only_odd_coins_0(bt)
     launcher_puzzle = LAUNCHER_PUZZLE
     launcher_puzzle_hash = launcher_puzzle.get_tree_hash()
     initial_singleton_puzzle = adaptor_for_singleton_inner_puzzle(ANYONE_CAN_SPEND_PUZZLE)
-    lineage_proof, launcher_id, condition_list, launcher_spend_bundle = launcher_conditions_and_spend_bundle(
+    launcher_id, condition_list, launcher_spend_bundle = launcher_conditions_and_spend_bundle(
         farmed_coin.name(), launcher_amount, initial_singleton_puzzle, metadata, launcher_puzzle
     )

tests/wallet/test_singleton_lifecycle_fast.py CHANGED Viewed

         @@@ -272,12 -272,12 +272,13 @@@ def launcher_conditions_and_spend_bundl
     puzzle_db.add_puzzle(launcher_puzzle)
     launcher_puzzle_hash = launcher_puzzle.get_tree_hash()
     launcher_coin = Coin(parent_coin_id, launcher_puzzle_hash, launcher_amount)
-    singleton_full_puzzle = singleton_puzzle(launcher_coin.name(), launcher_puzzle_hash, initial_singleton_inner_puzzle)
+    launcher_id = launcher_coin.name()
+    singleton_full_puzzle = singleton_puzzle(launcher_id, launcher_puzzle_hash, initial_singleton_inner_puzzle)
     puzzle_db.add_puzzle(singleton_full_puzzle)
     singleton_full_puzzle_hash = singleton_full_puzzle.get_tree_hash()
     message_program = Program.to([singleton_full_puzzle_hash, launcher_amount, metadata])
     expected_announcement = AssertCoinAnnouncement(
-        asserted_id=launcher_coin.name(), asserted_msg=message_program.get_tree_hash()
+        asserted_id=launcher_id, asserted_msg=message_program.get_tree_hash()
     )
     expected_conditions = []
     expected_conditions.append(
         @@@ -301,7 -301,7 +302,7 @@@
     )
     coin_spend = make_spend(launcher_coin, SerializedProgram.from_program(launcher_puzzle), solution)
     spend_bundle = SpendBundle([coin_spend], G2Element())
-    return launcher_coin.name(), expected_conditions, spend_bundle
+    return launcher_id, expected_conditions, spend_bundle
 def singleton_puzzle(launcher_id: bytes32, launcher_puzzle_hash: bytes32, inner_puzzle: Program) -> Program:
         @@@ -440,7 -440,7 +441,7 @@@ def spend_coin_to_singleton
     return additions, removals
-def find_interesting_singletons(puzzle_db: PuzzleDB, removals: List[CoinSpend]) -> List[SingletonWallet]:
+def find_interesting_singletons(removals: List[CoinSpend]) -> List[SingletonWallet]:
     singletons = []
     for coin_spend in removals:
         if coin_spend.coin.puzzle_hash == LAUNCHER_PUZZLE_HASH:
         @@@ -462,7 -462,7 +463,7 @@@
     return singletons
-def filter_p2_singleton(puzzle_db: PuzzleDB, singleton_wallet: SingletonWallet, additions: List[Coin]) -> List[Coin]:
+def filter_p2_singleton(puzzle_db: PuzzleDB, additions: List[Coin]) -> List[Coin]:
     r = []
     for coin in additions:
         puzzle = puzzle_db.puzzle_for_hash(coin.puzzle_hash)
         @@@ -495,7 -495,7 +496,7 @@@ def test_lifecycle_with_coinstore_as_wa
     assert len(list(coin_store.all_unspent_coins())) == 1
-    new_singletons = find_interesting_singletons(PUZZLE_DB, removals)
+    new_singletons = find_interesting_singletons(removals)
     interested_singletons.extend(new_singletons)
     assert len(interested_singletons) == 1
         @@@ -512,7 -512,7 +513,7 @@@
     now.seconds += 500
     now.height += 1
-    p2_singleton_coins = filter_p2_singleton(PUZZLE_DB, SINGLETON_WALLET, [farmed_coin])
+    p2_singleton_coins = filter_p2_singleton(PUZZLE_DB, [farmed_coin])
     assert p2_singleton_coins == [farmed_coin]
     assert len(list(coin_store.all_unspent_coins())) == 2
         @@@ -544,7 -544,7 +545,7 @@@
     now.seconds += 500
     now.height += 1
-    p2_singleton_coins = filter_p2_singleton(PUZZLE_DB, SINGLETON_WALLET, [farmed_coin])
+    p2_singleton_coins = filter_p2_singleton(PUZZLE_DB, [farmed_coin])
     assert p2_singleton_coins == [farmed_coin]
     assert len(list(coin_store.all_unspent_coins())) == 2
         @@@ -622,7 -622,7 +623,7 @@@
     now.seconds += 500
     now.height += 1
-    p2_singleton_coins = filter_p2_singleton(PUZZLE_DB, SINGLETON_WALLET, [farmed_coin])
+    p2_singleton_coins = filter_p2_singleton(PUZZLE_DB, [farmed_coin])
     assert p2_singleton_coins == [farmed_coin]
     assert len(list(coin_store.all_unspent_coins())) == 2
         @@@ -676,7 -676,7 +677,7 @@@
     now.seconds += 500
     now.height += 1
-    p2_singleton_coins = filter_p2_singleton(PUZZLE_DB, SINGLETON_WALLET, [farmed_coin])
+    p2_singleton_coins = filter_p2_singleton(PUZZLE_DB, [farmed_coin])
     assert p2_singleton_coins == [farmed_coin]
     assert len(list(coin_store.all_unspent_coins())) == 3

tests/wallet/test_util.py CHANGED Viewed

         @@@ -1,5 -1,5 +1,7 @@@
 from __future__ import annotations
+from typing import Any, Dict, List, Tuple
 import pytest
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
         @@@ -9,7 -9,7 +11,9 @@@ from chia.types.blockchain_format.sized
 from chia.types.coin_spend import make_spend
 from chia.util.errors import ValidationError
 from chia.util.ints import uint64
+from chia.wallet.lineage_proof import LineageProof, LineageProofField
 from chia.wallet.util.compute_hints import HintedCoin, compute_spend_hints_and_additions
+from chia.wallet.util.merkle_utils import list_to_binary_tree
 from chia.wallet.util.tx_config import (
     DEFAULT_COIN_SELECTION_CONFIG,
     DEFAULT_TX_CONFIG,
         @@@ -92,3 -92,3 +96,86 @@@ def test_tx_config() -> None
     assert TXConfigLoader.from_json_dict({}).autofill(
         constants=DEFAULT_CONSTANTS, config={"reuse_public_key_for_change": {"1": True}}, logged_in_fingerprint=1
     ).to_json_dict() == {**default_tx_config, "reuse_puzhash": True}
+def test_list_to_binary_tree() -> None:
+    assert list_to_binary_tree([1]) == 1
+    assert list_to_binary_tree([1, 2]) == (1, 2)
+    assert list_to_binary_tree([1, 2, 3]) == ((1, 2), 3)
+    assert list_to_binary_tree([1, 2, 3, 4]) == ((1, 2), (3, 4))
+    assert list_to_binary_tree([1, 2, 3, 4, 5]) == (((1, 2), 3), (4, 5))
+    with pytest.raises(ValueError):
+        list_to_binary_tree([])
+@pytest.mark.parametrize(
+    "serializations",
+    [
+        (tuple(), Program.to(None), []),
+        ((bytes32([0] * 32),), Program.to([bytes32([0] * 32)]), [LineageProofField.PARENT_NAME]),
+        (
+            (bytes32([0] * 32), bytes32([0] * 32)),
+            Program.to([bytes32([0] * 32), bytes32([0] * 32)]),
+            [LineageProofField.PARENT_NAME, LineageProofField.INNER_PUZZLE_HASH],
+        ),
+        (
+            (bytes32([0] * 32), bytes32([0] * 32), uint64(0)),
+            Program.to([bytes32([0] * 32), bytes32([0] * 32), uint64(0)]),
+            [LineageProofField.PARENT_NAME, LineageProofField.INNER_PUZZLE_HASH, LineageProofField.AMOUNT],
+        ),
+    ],
+)
+def test_lineage_proof_varargs(serializations: Tuple[Tuple[Any, ...], Program, List[LineageProofField]]) -> None:
+    var_args, expected_program, lp_fields = serializations
+    assert LineageProof(*var_args).to_program() == expected_program
+    assert LineageProof(*var_args) == LineageProof.from_program(expected_program, lp_fields)
+@pytest.mark.parametrize(
+    "serializations",
+    [
+        ({}, Program.to(None), []),
+        ({"parent_name": bytes32([0] * 32)}, Program.to([bytes32([0] * 32)]), [LineageProofField.PARENT_NAME]),
+        (
+            {"parent_name": bytes32([0] * 32), "inner_puzzle_hash": bytes32([0] * 32)},
+            Program.to([bytes32([0] * 32), bytes32([0] * 32)]),
+            [LineageProofField.PARENT_NAME, LineageProofField.INNER_PUZZLE_HASH],
+        ),
+        (
+            {"parent_name": bytes32([0] * 32), "inner_puzzle_hash": bytes32([0] * 32), "amount": uint64(0)},
+            Program.to([bytes32([0] * 32), bytes32([0] * 32), uint64(0)]),
+            [LineageProofField.PARENT_NAME, LineageProofField.INNER_PUZZLE_HASH, LineageProofField.AMOUNT],
+        ),
+        (
+            {"parent_name": bytes32([0] * 32), "amount": uint64(0)},
+            Program.to([bytes32([0] * 32), uint64(0)]),
+            [LineageProofField.PARENT_NAME, LineageProofField.AMOUNT],
+        ),
+        (
+            {"inner_puzzle_hash": bytes32([0] * 32), "amount": uint64(0)},
+            Program.to([bytes32([0] * 32), uint64(0)]),
+            [LineageProofField.INNER_PUZZLE_HASH, LineageProofField.AMOUNT],
+        ),
+        ({"amount": uint64(0)}, Program.to([uint64(0)]), [LineageProofField.AMOUNT]),
+        (
+            {"inner_puzzle_hash": bytes32([0] * 32)},
+            Program.to([bytes32([0] * 32)]),
+            [LineageProofField.INNER_PUZZLE_HASH],
+        ),
+    ],
+)
+def test_lineage_proof_kwargs(serializations: Tuple[Dict[str, Any], Program, List[LineageProofField]]) -> None:
+    kwargs, expected_program, lp_fields = serializations
+    assert LineageProof(**kwargs).to_program() == expected_program
+    assert LineageProof(**kwargs) == LineageProof.from_program(expected_program, lp_fields)
+def test_lineage_proof_errors() -> None:
+    with pytest.raises(ValueError, match="Mismatch"):
+        LineageProof.from_program(Program.to([]), [LineageProofField.PARENT_NAME])
+    with pytest.raises(StopIteration):
+        LineageProof.from_program(Program.to([bytes32([0] * 32)]), [])
+    with pytest.raises(ValueError):
+        LineageProof.from_program(Program.to([bytes32([1] * 32)]), [LineageProofField.AMOUNT])
+    with pytest.raises(ValueError):
+        LineageProof.from_program(Program.to([uint64(0)]), [LineageProofField.PARENT_NAME])

tests/wallet/test_wallet_blockchain.py CHANGED Viewed

         @@@ -1,97 -1,97 +1,116 @@@
 from __future__ import annotations
 import dataclasses
+from typing import List
 import pytest
 from chia.consensus.blockchain import AddBlockResult
 from chia.protocols import full_node_protocol
 from chia.types.blockchain_format.vdf import VDFProof
-from chia.types.weight_proof import WeightProof
+from chia.types.full_block import FullBlock
+from chia.types.header_block import HeaderBlock
 from chia.util.generator_tools import get_block_header
+from chia.util.ints import uint8, uint32
 from chia.wallet.key_val_store import KeyValStore
 from chia.wallet.wallet_blockchain import WalletBlockchain
 from tests.conftest import ConsensusMode
 from tests.util.db_connection import DBConnection
+from tests.util.setup_nodes import OldSimulatorsAndWallets
-class TestWalletBlockchain:
-    @pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN, ConsensusMode.HARD_FORK_2_0], reason="save time")
-    @pytest.mark.anyio
-    async def test_wallet_blockchain(self, simulator_and_wallet, default_1000_blocks):
-        [full_node_api], [(wallet_node, _)], bt = simulator_and_wallet
+@pytest.mark.limit_consensus_modes(allowed=[ConsensusMode.PLAIN, ConsensusMode.HARD_FORK_2_0], reason="save time")
+@pytest.mark.anyio
+async def test_wallet_blockchain(
+    simulator_and_wallet: OldSimulatorsAndWallets, default_1000_blocks: List[FullBlock]
+) -> None:
+    [full_node_api], [(wallet_node, _)], bt = simulator_and_wallet
-        for block in default_1000_blocks[:600]:
-            await full_node_api.full_node.add_block(block)
+    for block in default_1000_blocks[:600]:
+        await full_node_api.full_node.add_block(block)
-        res = await full_node_api.request_proof_of_weight(
-            full_node_protocol.RequestProofOfWeight(
-                default_1000_blocks[499].height + 1, default_1000_blocks[499].header_hash
-            )
+    resp = await full_node_api.request_proof_of_weight(
+        full_node_protocol.RequestProofOfWeight(
+            uint32(default_1000_blocks[499].height + 1), default_1000_blocks[499].header_hash
         )
-        res_2 = await full_node_api.request_proof_of_weight(
-            full_node_protocol.RequestProofOfWeight(
-                default_1000_blocks[460].height + 1, default_1000_blocks[460].header_hash
-            )
+    )
+    assert resp is not None
+    resp_2 = await full_node_api.request_proof_of_weight(
+        full_node_protocol.RequestProofOfWeight(
+            uint32(default_1000_blocks[460].height + 1), default_1000_blocks[460].header_hash
         )
-        res_3 = await full_node_api.request_proof_of_weight(
-            full_node_protocol.RequestProofOfWeight(
-                default_1000_blocks[505].height + 1, default_1000_blocks[505].header_hash
-            )
+    )
+    assert resp_2 is not None
+    resp_3 = await full_node_api.request_proof_of_weight(
+        full_node_protocol.RequestProofOfWeight(
+            uint32(default_1000_blocks[505].height + 1), default_1000_blocks[505].header_hash
         )
-        weight_proof: WeightProof = full_node_protocol.RespondProofOfWeight.from_bytes(res.data).wp
-        records = await wallet_node._weight_proof_handler.validate_weight_proof(weight_proof, True)
-        weight_proof_short: WeightProof = full_node_protocol.RespondProofOfWeight.from_bytes(res_2.data).wp
-        records_short = await wallet_node._weight_proof_handler.validate_weight_proof(weight_proof_short, True)
-        weight_proof_long: WeightProof = full_node_protocol.RespondProofOfWeight.from_bytes(res_3.data).wp
-        records_long = await wallet_node._weight_proof_handler.validate_weight_proof(weight_proof_long, True)
-        async with DBConnection(1) as db_wrapper:
-            store = await KeyValStore.create(db_wrapper)
-            chain = await WalletBlockchain.create(store, bt.constants)
-            assert (await chain.get_peak_block()) is None
-            assert chain.get_latest_timestamp() == 0
-            await chain.new_valid_weight_proof(weight_proof, records)
-            assert (await chain.get_peak_block()) is not None
-            assert (await chain.get_peak_block()).height == 499
-            assert chain.get_latest_timestamp() > 0
-            await chain.new_valid_weight_proof(weight_proof_short, records_short)
-            assert (await chain.get_peak_block()).height == 499
-            await chain.new_valid_weight_proof(weight_proof_long, records_long)
-            assert (await chain.get_peak_block()).height == 505
-            header_blocks = []
-            for block in default_1000_blocks:
-                header_block = get_block_header(block, [], [])
-                header_blocks.append(header_block)
-            res, err = await chain.add_block(header_blocks[50])
-            print(res, err)
-            assert res == AddBlockResult.DISCONNECTED_BLOCK
-            res, err = await chain.add_block(header_blocks[400])
-            print(res, err)
-            assert res == AddBlockResult.ALREADY_HAVE_BLOCK
-            res, err = await chain.add_block(header_blocks[507])
-            print(res, err)
-            assert res == AddBlockResult.DISCONNECTED_BLOCK
-            res, err = await chain.add_block(
-                dataclasses.replace(header_blocks[506], challenge_chain_ip_proof=VDFProof(2, b"123", True))
-            )
-            assert res == AddBlockResult.INVALID_BLOCK
-            assert (await chain.get_peak_block()).height == 505
-            for block in header_blocks[506:]:
-                res, err = await chain.add_block(block)
-                assert res == AddBlockResult.NEW_PEAK
-                assert (await chain.get_peak_block()).height == block.height
-            assert (await chain.get_peak_block()).height == 999
+    )
+    assert resp_3 is not None
+    weight_proof = full_node_protocol.RespondProofOfWeight.from_bytes(resp.data).wp
+    assert wallet_node._weight_proof_handler is not None
+    records = await wallet_node._weight_proof_handler.validate_weight_proof(weight_proof, True)
+    weight_proof_short = full_node_protocol.RespondProofOfWeight.from_bytes(resp_2.data).wp
+    records_short = await wallet_node._weight_proof_handler.validate_weight_proof(weight_proof_short, True)
+    weight_proof_long = full_node_protocol.RespondProofOfWeight.from_bytes(resp_3.data).wp
+    records_long = await wallet_node._weight_proof_handler.validate_weight_proof(weight_proof_long, True)
+    async with DBConnection(1) as db_wrapper:
+        store = await KeyValStore.create(db_wrapper)
+        chain = await WalletBlockchain.create(store, bt.constants)
+        assert (await chain.get_peak_block()) is None
+        assert chain.get_latest_timestamp() == 0
+        await chain.new_valid_weight_proof(weight_proof, records)
+        peak_block = await chain.get_peak_block()
+        assert peak_block is not None
+        assert peak_block.height == 499
+        assert chain.get_latest_timestamp() > 0
+        await chain.new_valid_weight_proof(weight_proof_short, records_short)
+        peak_block = await chain.get_peak_block()
+        assert peak_block is not None
+        assert peak_block.height == 499
+        await chain.new_valid_weight_proof(weight_proof_long, records_long)
+        peak_block = await chain.get_peak_block()
+        assert peak_block is not None
+        assert peak_block.height == 505
+        header_blocks: List[HeaderBlock] = []
+        for block in default_1000_blocks:
+            header_block = get_block_header(block, [], [])
+            header_blocks.append(header_block)
+        res, err = await chain.add_block(header_blocks[50])
+        print(res, err)
+        assert res == AddBlockResult.DISCONNECTED_BLOCK
+        res, err = await chain.add_block(header_blocks[400])
+        print(res, err)
+        assert res == AddBlockResult.ALREADY_HAVE_BLOCK
+        res, err = await chain.add_block(header_blocks[507])
+        print(res, err)
+        assert res == AddBlockResult.DISCONNECTED_BLOCK
+        res, err = await chain.add_block(
+            dataclasses.replace(header_blocks[506], challenge_chain_ip_proof=VDFProof(uint8(2), b"123", True))
+        )
+        assert res == AddBlockResult.INVALID_BLOCK
+        peak_block = await chain.get_peak_block()
+        assert peak_block is not None
+        assert peak_block.height == 505
+        for header_block in header_blocks[506:]:
+            res, err = await chain.add_block(header_block)
+            assert res == AddBlockResult.NEW_PEAK
+            peak_block = await chain.get_peak_block()
+            assert peak_block is not None
+            assert peak_block.height == header_block.height
+        peak_block = await chain.get_peak_block()
+        assert peak_block is not None
+        assert peak_block.height == 999

tests/wallet/test_wallet_node.py CHANGED Viewed

         @@@ -6,10 -6,10 +6,9 @@@ import sy
 import time
 import types
 from pathlib import Path
-from typing import Any, Dict, List, Optional
+from typing import List, Optional
 import pytest
-from chia_rs import PrivateKey
 from chia.protocols import wallet_protocol
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
         @@@ -35,12 -35,12 +34,12 @@@ from tests.util.time_out_assert import
 @pytest.mark.anyio
 async def test_get_private_key(root_path_populated_with_config: Path, get_temp_keyring: Keychain) -> None:
-    root_path: Path = root_path_populated_with_config
-    keychain: Keychain = get_temp_keyring
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants, keychain)
-    sk: PrivateKey = keychain.add_private_key(generate_mnemonic())
-    fingerprint: int = sk.get_g1().get_fingerprint()
+    root_path = root_path_populated_with_config
+    keychain = get_temp_keyring
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants, keychain)
+    sk = keychain.add_private_key(generate_mnemonic())
+    fingerprint = sk.get_g1().get_fingerprint()
     key = await node.get_private_key(fingerprint)
         @@@ -50,12 -50,12 +49,12 @@@
 @pytest.mark.anyio
 async def test_get_private_key_default_key(root_path_populated_with_config: Path, get_temp_keyring: Keychain) -> None:
-    root_path: Path = root_path_populated_with_config
-    keychain: Keychain = get_temp_keyring
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants, keychain)
-    sk: PrivateKey = keychain.add_private_key(generate_mnemonic())
-    fingerprint: int = sk.get_g1().get_fingerprint()
+    root_path = root_path_populated_with_config
+    keychain = get_temp_keyring
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants, keychain)
+    sk = keychain.add_private_key(generate_mnemonic())
+    fingerprint = sk.get_g1().get_fingerprint()
     # Add a couple more keys
     keychain.add_private_key(generate_mnemonic())
         @@@ -73,10 -73,10 +72,10 @@@
 async def test_get_private_key_missing_key(
     root_path_populated_with_config: Path, get_temp_keyring: Keychain, fingerprint: Optional[int]
 ) -> None:
-    root_path: Path = root_path_populated_with_config
-    keychain: Keychain = get_temp_keyring  # empty keyring
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants, keychain)
+    root_path = root_path_populated_with_config
+    keychain = get_temp_keyring  # empty keyring
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants, keychain)
     # Keyring is empty, so requesting a key by fingerprint or None should return None
     key = await node.get_private_key(fingerprint)
         @@@ -88,12 -88,12 +87,12 @@@
 async def test_get_private_key_missing_key_use_default(
     root_path_populated_with_config: Path, get_temp_keyring: Keychain
 ) -> None:
-    root_path: Path = root_path_populated_with_config
-    keychain: Keychain = get_temp_keyring
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants, keychain)
-    sk: PrivateKey = keychain.add_private_key(generate_mnemonic())
-    fingerprint: int = sk.get_g1().get_fingerprint()
+    root_path = root_path_populated_with_config
+    keychain = get_temp_keyring
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants, keychain)
+    sk = keychain.add_private_key(generate_mnemonic())
+    fingerprint = sk.get_g1().get_fingerprint()
     # Stupid sanity check that the fingerprint we're going to use isn't actually in the keychain
     assert fingerprint != 1234567890
         @@@ -106,12 -106,12 +105,12 @@@
 def test_log_in(root_path_populated_with_config: Path, get_temp_keyring: Keychain) -> None:
-    root_path: Path = root_path_populated_with_config
-    keychain: Keychain = get_temp_keyring
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
-    sk: PrivateKey = keychain.add_private_key(generate_mnemonic())
-    fingerprint: int = sk.get_g1().get_fingerprint()
+    root_path = root_path_populated_with_config
+    keychain = get_temp_keyring
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
+    sk = keychain.add_private_key(generate_mnemonic())
+    fingerprint = sk.get_g1().get_fingerprint()
     node.log_in(sk)
         @@@ -121,23 -121,23 +120,23 @@@
 def test_log_in_failure_to_write_last_used_fingerprint(
-    root_path_populated_with_config: Path, get_temp_keyring: Keychain, monkeypatch: Any
+    root_path_populated_with_config: Path, get_temp_keyring: Keychain, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     called_update_last_used_fingerprint: bool = False
-    def patched_update_last_used_fingerprint(self: Any) -> None:
+    def patched_update_last_used_fingerprint(self: Self) -> None:
         nonlocal called_update_last_used_fingerprint
         called_update_last_used_fingerprint = True
         raise Exception("Generic write failure")
     with monkeypatch.context() as m:
         m.setattr(WalletNode, "update_last_used_fingerprint", patched_update_last_used_fingerprint)
-        root_path: Path = root_path_populated_with_config
-        keychain: Keychain = get_temp_keyring
-        config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-        node: WalletNode = WalletNode(config, root_path, test_constants)
-        sk: PrivateKey = keychain.add_private_key(generate_mnemonic())
-        fingerprint: int = sk.get_g1().get_fingerprint()
+        root_path = root_path_populated_with_config
+        keychain = get_temp_keyring
+        config = load_config(root_path, "config.yaml", "wallet")
+        node = WalletNode(config, root_path, test_constants)
+        sk = keychain.add_private_key(generate_mnemonic())
+        fingerprint = sk.get_g1().get_fingerprint()
         # Expect log_in to succeed, even though we can't write the last used fingerprint
         node.log_in(sk)
         @@@ -149,12 -149,12 +148,12 @@@
 def test_log_out(root_path_populated_with_config: Path, get_temp_keyring: Keychain) -> None:
-    root_path: Path = root_path_populated_with_config
-    keychain: Keychain = get_temp_keyring
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
-    sk: PrivateKey = keychain.add_private_key(generate_mnemonic())
-    fingerprint: int = sk.get_g1().get_fingerprint()
+    root_path = root_path_populated_with_config
+    keychain = get_temp_keyring
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
+    sk = keychain.add_private_key(generate_mnemonic())
+    fingerprint = sk.get_g1().get_fingerprint()
     node.log_in(sk)
         @@@ -170,32 -170,32 +169,32 @@@
 def test_get_last_used_fingerprint_path(root_path_populated_with_config: Path) -> None:
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
-    path: Optional[Path] = node.get_last_used_fingerprint_path()
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
+    path = node.get_last_used_fingerprint_path()
     assert path == root_path / "wallet" / "db" / "last_used_fingerprint"
 def test_get_last_used_fingerprint(root_path_populated_with_config: Path) -> None:
-    path: Path = root_path_populated_with_config / "wallet" / "db" / "last_used_fingerprint"
+    path = root_path_populated_with_config / "wallet" / "db" / "last_used_fingerprint"
     path.parent.mkdir(parents=True, exist_ok=True)
     path.write_text("1234567890")
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
-    last_used_fingerprint: Optional[int] = node.get_last_used_fingerprint()
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
+    last_used_fingerprint = node.get_last_used_fingerprint()
     assert last_used_fingerprint == 1234567890
 def test_get_last_used_fingerprint_file_doesnt_exist(root_path_populated_with_config: Path) -> None:
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
-    last_used_fingerprint: Optional[int] = node.get_last_used_fingerprint()
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
+    last_used_fingerprint = node.get_last_used_fingerprint()
     assert last_used_fingerprint is None
         @@@ -204,10 -204,10 +203,10 @@@ def test_get_last_used_fingerprint_file
     if sys.platform in ["win32", "cygwin"]:
         pytest.skip("Setting UNIX file permissions doesn't apply to Windows")
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
-    path: Path = node.get_last_used_fingerprint_path()
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
+    path = node.get_last_used_fingerprint_path()
     path.parent.mkdir(parents=True, exist_ok=True)
     path.write_text("1234567890")
         @@@ -216,7 -216,7 +215,7 @@@
     # Make the file unreadable
     path.chmod(0o000)
-    last_used_fingerprint: Optional[int] = node.get_last_used_fingerprint()
+    last_used_fingerprint = node.get_last_used_fingerprint()
     assert last_used_fingerprint is None
         @@@ -231,22 -231,22 +230,22 @@@
 def test_get_last_used_fingerprint_file_cant_read_win32(
-    root_path_populated_with_config: Path, monkeypatch: Any
+    root_path_populated_with_config: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     if sys.platform not in ["win32", "cygwin"]:
         pytest.skip("Windows-specific test")
-    called_read_text: bool = False
+    called_read_text = False
-    def patched_pathlib_path_read_text(self: Any) -> str:
+    def patched_pathlib_path_read_text(self: Self) -> str:
         nonlocal called_read_text
         called_read_text = True
         raise PermissionError("Permission denied")
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
-    path: Path = node.get_last_used_fingerprint_path()
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
+    path = node.get_last_used_fingerprint_path()
     path.parent.mkdir(parents=True, exist_ok=True)
     path.write_text("1234567890")
         @@@ -268,10 -268,10 +267,10 @@@
 def test_get_last_used_fingerprint_file_with_whitespace(root_path_populated_with_config: Path) -> None:
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
-    path: Path = node.get_last_used_fingerprint_path()
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
+    path = node.get_last_used_fingerprint_path()
     path.parent.mkdir(parents=True, exist_ok=True)
     path.write_text("\n\r\n \t1234567890\r\n\n")
         @@@ -279,9 -279,9 +278,9 @@@
 def test_update_last_used_fingerprint_missing_fingerprint(root_path_populated_with_config: Path) -> None:
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
     node.logged_in_fingerprint = None
     with pytest.raises(AssertionError):
         @@@ -289,9 -289,9 +288,9 @@@
 def test_update_last_used_fingerprint_create_intermediate_dirs(root_path_populated_with_config: Path) -> None:
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
     node.logged_in_fingerprint = 9876543210
     path = node.get_last_used_fingerprint_path()
         @@@ -303,9 -303,9 +302,9 @@@
 def test_update_last_used_fingerprint(root_path_populated_with_config: Path) -> None:
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
-    node: WalletNode = WalletNode(config, root_path, test_constants)
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
+    node = WalletNode(config, root_path, test_constants)
     node.logged_in_fingerprint = 9876543210
     path = node.get_last_used_fingerprint_path()
         @@@ -318,8 -318,8 +317,8 @@@
 @pytest.mark.parametrize("testing", [True, False])
 @pytest.mark.parametrize("offset", [0, 550, 650])
 def test_timestamp_in_sync(root_path_populated_with_config: Path, testing: bool, offset: int) -> None:
-    root_path: Path = root_path_populated_with_config
-    config: Dict[str, Any] = load_config(root_path, "config.yaml", "wallet")
+    root_path = root_path_populated_with_config
+    config = load_config(root_path, "config.yaml", "wallet")
     wallet_node = WalletNode(config, root_path, test_constants)
     now = time.time()
     wallet_node.config["testing"] = testing
         @@@ -353,8 -353,8 +352,8 @@@ async def test_get_timestamp_for_height
     # Clear the cache and add the peak back with a modified timestamp
     cache = wallet_node.get_cache_for_peer(full_node_peer)
     cache.clear_after_height(0)
-    modified_foliage_transaction_block = dataclasses.replace(
-        block_at_peak.foliage_transaction_block, timestamp=uint64(timestamp_at_peak + 1)
+    modified_foliage_transaction_block = block_at_peak.foliage_transaction_block.replace(
+        timestamp=uint64(timestamp_at_peak + 1)
     )
     modified_peak = dataclasses.replace(peak, foliage_transaction_block=modified_foliage_transaction_block)
     cache.add_to_blocks(modified_peak)
         @@@ -385,7 -385,7 +384,7 @@@
 @pytest.mark.anyio
 async def test_unique_puzzle_hash_subscriptions(simulator_and_wallet: OldSimulatorsAndWallets) -> None:
-    _, [(node, _)], bt = simulator_and_wallet
+    _, [(node, _)], _ = simulator_and_wallet
     puzzle_hashes = await node.get_puzzle_hashes_to_subscribe()
     assert len(puzzle_hashes) > 1
     assert len(set(puzzle_hashes)) == len(puzzle_hashes)
         @@@ -557,7 -557,7 +556,7 @@@ async def test_transaction_send_cache
         await time_out_assert(5, logged_spends_len, 2)
     # Tell the wallet that we recieved the spend (but failed to process it so it should send again)
-    msg: Message = make_msg(
+    msg = make_msg(
         ProtocolMessageTypes.transaction_ack,
         wallet_protocol.TransactionAck(tx.name, uint8(MempoolInclusionStatus.FAILED), Err.GENERATOR_RUNTIME_ERROR.name),
     )

tests/wallet/test_wallet_user_store.py CHANGED Viewed

         @@@ -8,7 -8,7 +8,7 @@@ from tests.util.db_connection import DB
 @pytest.mark.anyio
-async def test_store():
+async def test_store() -> None:
     async with DBConnection(1) as db_wrapper:
         store = await WalletUserStore.create(db_wrapper)
         await store.init_wallet()
         @@@ -17,6 -17,6 +17,7 @@@
             assert (await store.get_last_wallet()).id == i
             wallet = await store.create_wallet("CAT_WALLET", WalletType.CAT, "abc")
             assert wallet.id == i + 1
+        assert wallet is not None
         assert wallet.id == 5
         for i in range(2, 6):

tools/generate_chain.py CHANGED Viewed

         @@@ -18,7 -18,7 +18,7 @@@ from chia.types.blockchain_format.coin
 from chia.types.spend_bundle import SpendBundle
 from chia.util.chia_logging import initialize_logging
 from chia.util.ints import uint32, uint64
-from tools.test_constants import test_constants
+from tests.util.constants import test_constants
 @contextmanager

tools/run_block.py CHANGED Viewed

         @@@ -38,155 -38,155 +38,14 @@@ and in this way they control whether a
 from __future__ import annotations
 import json
-from dataclasses import dataclass
 from pathlib import Path
-from typing import Dict, List, Tuple
 import click
-from chia.consensus.constants import ConsensusConstants
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
-from chia.types.blockchain_format.coin import Coin
-from chia.types.blockchain_format.serialized_program import SerializedProgram
-from chia.types.blockchain_format.sized_bytes import bytes32
-from chia.types.condition_opcodes import ConditionOpcode
-from chia.types.condition_with_args import ConditionWithArgs
-from chia.types.generator_types import BlockGenerator
 from chia.util.config import load_config
 from chia.util.default_root import DEFAULT_ROOT_PATH
-from chia.util.ints import uint32, uint64
-from chia.wallet.cat_wallet.cat_utils import match_cat_puzzle
-from chia.wallet.puzzles.load_clvm import load_serialized_clvm_maybe_recompile
-from chia.wallet.uncurried_puzzle import uncurry_puzzle
-DESERIALIZE_MOD = load_serialized_clvm_maybe_recompile(
-    "chialisp_deserialisation.clsp", package_or_requirement="chia.consensus.puzzles"
-)
-@dataclass
-class NPC:
-    coin_name: bytes32
-    puzzle_hash: bytes32
-    conditions: List[Tuple[ConditionOpcode, List[ConditionWithArgs]]]
-@dataclass
-class CAT:
-    asset_id: str
-    memo: str
-    npc: NPC
-    def cat_to_dict(self):
-        return {"asset_id": self.asset_id, "memo": self.memo, "npc": npc_to_dict(self.npc)}
-def condition_with_args_to_dict(condition_with_args: ConditionWithArgs):
-    return {
-        "condition_opcode": condition_with_args.opcode.name,
-        "arguments": [arg.hex() for arg in condition_with_args.vars],
-    }
-def condition_list_to_dict(condition_list: Tuple[ConditionOpcode, List[ConditionWithArgs]]):
-    assert all([condition_list[0] == cwa.opcode for cwa in condition_list[1]])
-    return [condition_with_args_to_dict(cwa) for cwa in condition_list[1]]
-def npc_to_dict(npc: NPC):
-    return {
-        "coin_name": npc.coin_name.hex(),
-        "conditions": [{"condition_type": c[0].name, "conditions": condition_list_to_dict(c)} for c in npc.conditions],
-        "puzzle_hash": npc.puzzle_hash.hex(),
-    }
-def run_generator(block_generator: BlockGenerator, constants: ConsensusConstants, max_cost: int) -> List[CAT]:
-    block_args = [bytes(a) for a in block_generator.generator_refs]
-    cost, block_result = block_generator.program.run_with_cost(max_cost, [DESERIALIZE_MOD, block_args])
-    coin_spends = block_result.first()
-    cat_list: List[CAT] = []
-    for spend in coin_spends.as_iter():
-        parent, puzzle, amount, solution = spend.as_iter()
-        args = match_cat_puzzle(uncurry_puzzle(puzzle))
-        if args is None:
-            continue
-        _, asset_id, _ = args
-        memo = ""
-        puzzle_result = puzzle.run(solution)
-        conds: Dict[ConditionOpcode, List[ConditionWithArgs]] = {}
-        for condition in puzzle_result.as_python():
-            op = ConditionOpcode(condition[0])
-            if op not in conds:
-                conds[op] = []
-            if condition[0] != ConditionOpcode.CREATE_COIN or len(condition) < 4:
-                conds[op].append(ConditionWithArgs(op, [i for i in condition[1:3]]))
-                continue
-            # If only 3 elements (opcode + 2 args), there is no memo, this is ph, amount
-            if type(condition[3]) is not list:
-                # If it's not a list, it's not the correct format
-                conds[op].append(ConditionWithArgs(op, [i for i in condition[1:3]]))
-                continue
-            conds[op].append(ConditionWithArgs(op, [i for i in condition[1:3]] + [condition[3][0]]))
-            # special retirement address
-            if condition[3][0].hex() != "0000000000000000000000000000000000000000000000000000000000000000":
-                continue
-            if len(condition[3]) >= 2:
-                try:
-                    memo = condition[3][1].decode("utf-8", errors="strict")
-                except UnicodeError:
-                    pass  # ignore this error which should leave memo as empty string
-            # technically there could be more such create_coin ops in the list but our wallet does not
-            # so leaving it for the future
-            break
-        puzzle_hash = puzzle.get_tree_hash()
-        coin = Coin(bytes32(parent.as_atom()), puzzle_hash, amount.as_int())
-        cat_list.append(
-            CAT(
-                asset_id=bytes(asset_id).hex()[2:],
-                memo=memo,
-                npc=NPC(coin.name(), puzzle_hash, [(op, cond) for op, cond in conds.items()]),
-            )
-        )
-    return cat_list
-def ref_list_to_args(ref_list: List[uint32], root_path: Path) -> List[SerializedProgram]:
-    args = []
-    for height in ref_list:
-        with open(root_path / f"{height}.json", "rb") as f:
-            program_str = json.load(f)["block"]["transactions_generator"]
-            args.append(SerializedProgram.fromhex(program_str))
-    return args
-def run_generator_with_args(
-    generator_program_hex: str,
-    generator_args: List[SerializedProgram],
-    constants: ConsensusConstants,
-    cost: uint64,
-) -> List[CAT]:
-    if not generator_program_hex:
-        return []
-    generator_program = SerializedProgram.fromhex(generator_program_hex)
-    block_generator = BlockGenerator(generator_program, generator_args, [])
-    return run_generator(block_generator, constants, min(constants.MAX_BLOCK_COST_CLVM, cost))
+from tests.util.run_block import run_json_block
 @click.command()
         @@@ -196,19 -196,19 +55,6 @@@ def cmd_run_json_block_file(filename)
     return run_json_block_file(Path(filename))
-def run_json_block(full_block, parent: Path, constants: ConsensusConstants) -> List[CAT]:
-    ref_list = full_block["block"]["transactions_generator_ref_list"]
-    tx_info: dict = full_block["block"]["transactions_info"]
-    generator_program_hex: str = full_block["block"]["transactions_generator"]
-    cat_list: List[CAT] = []
-    if tx_info and generator_program_hex:
-        cost = tx_info["cost"]
-        args = ref_list_to_args(ref_list, parent)
-        cat_list = run_generator_with_args(generator_program_hex, args, constants, cost)
-    return cat_list
 def run_json_block_file(filename: Path):
     full_block = json.load(filename.open("rb"))
     # pull in current constants from config.yaml

tools/test_full_sync.py CHANGED Viewed

         @@@ -3,15 -3,15 +3,9 @@@
 from __future__ import annotations
 import asyncio
-import cProfile
-import logging
 import os
-import shutil
-import tempfile
-import time
-from contextlib import contextmanager
 from pathlib import Path
-from typing import Callable, Iterator, List, Optional, cast
+from typing import Optional
 import aiosqlite
 import click
         @@@ -20,213 -20,213 +14,10 @@@ import zst
 from chia.cmds.init_funcs import chia_init
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.full_node.full_node import FullNode
-from chia.server.outbound_message import Message, NodeType
-from chia.server.server import ChiaServer
 from chia.server.ws_connection import WSChiaConnection
-from chia.simulator.block_tools import make_unfinished_block
-from chia.types.blockchain_format.sized_bytes import bytes32
 from chia.types.full_block import FullBlock
-from chia.types.peer_info import PeerInfo
 from chia.util.config import load_config
-from chia.util.ints import uint16
-from tools.test_constants import test_constants as TEST_CONSTANTS
-class ExitOnError(logging.Handler):
-    def __init__(self):
-        super().__init__()
-        self.exit_with_failure = False
-    def emit(self, record):
-        if record.levelno != logging.ERROR:
-            return
-        self.exit_with_failure = True
-@contextmanager
-def enable_profiler(profile: bool, counter: int) -> Iterator[None]:
-    if not profile:
-        yield
-        return
-    with cProfile.Profile() as pr:
-        receive_start_time = time.monotonic()
-        yield
-    if time.monotonic() - receive_start_time > 5:
-        pr.create_stats()
-        pr.dump_stats(f"slow-batch-{counter:05d}.profile")
-class FakeServer:
-    async def send_to_all(self, messages: List[Message], node_type: NodeType, exclude: Optional[bytes32] = None):
-        pass
-    def set_received_message_callback(self, callback: Callable):
-        pass
-    async def get_peer_info(self) -> Optional[PeerInfo]:
-        return None
-    def get_connections(
-        self, node_type: Optional[NodeType] = None, *, outbound: Optional[bool] = False
-    ) -> List[WSChiaConnection]:
-        return []
-    def is_duplicate_or_self_connection(self, target_node: PeerInfo) -> bool:
-        return False
-    async def start_client(
-        self,
-        target_node: PeerInfo,
-        on_connect: Callable = None,
-        auth: bool = False,
-        is_feeler: bool = False,
-    ) -> bool:
-        return False
-class FakePeer:
-    def get_peer_logging(self) -> PeerInfo:
-        return PeerInfo("0.0.0.0", uint16(0))
-    def __init__(self):
-        self.peer_node_id = bytes([0] * 32)
-    async def get_peer_info(self) -> Optional[PeerInfo]:
-        return None
-async def run_sync_test(
-    file: Path,
-    db_version,
-    profile: bool,
-    single_thread: bool,
-    test_constants: bool,
-    keep_up: bool,
-    db_sync: str,
-    node_profiler: bool,
-    start_at_checkpoint: Optional[str],
-) -> None:
-    logger = logging.getLogger()
-    logger.setLevel(logging.WARNING)
-    handler = logging.FileHandler("test-full-sync.log")
-    handler.setFormatter(
-        logging.Formatter(
-            "%(levelname)-8s %(message)s",
-            datefmt="%Y-%m-%dT%H:%M:%S",
-        )
-    )
-    logger.addHandler(handler)
-    check_log = ExitOnError()
-    logger.addHandler(check_log)
-    with tempfile.TemporaryDirectory() as root_dir:
-        root_path = Path(root_dir, "root")
-        if start_at_checkpoint is not None:
-            shutil.copytree(start_at_checkpoint, root_path)
-        chia_init(root_path, should_check_keys=False, v1_db=(db_version == 1))
-        config = load_config(root_path, "config.yaml")
-        if test_constants:
-            constants = TEST_CONSTANTS
-        else:
-            overrides = config["network_overrides"]["constants"][config["selected_network"]]
-            constants = DEFAULT_CONSTANTS.replace_str_to_bytes(**overrides)
-        if single_thread:
-            config["full_node"]["single_threaded"] = True
-        config["full_node"]["db_sync"] = db_sync
-        config["full_node"]["enable_profiler"] = node_profiler
-        full_node = await FullNode.create(
-            config["full_node"],
-            root_path=root_path,
-            consensus_constants=constants,
-        )
-        full_node.set_server(cast(ChiaServer, FakeServer()))
-        async with full_node.manage():
-            peak = full_node.blockchain.get_peak()
-            if peak is not None:
-                height = int(peak.height)
-            else:
-                height = 0
-            peer: WSChiaConnection = cast(WSChiaConnection, FakePeer())
-            print()
-            counter = 0
-            monotonic = height
-            prev_hash = None
-            async with aiosqlite.connect(file) as in_db:
-                await in_db.execute("pragma query_only")
-                rows = await in_db.execute(
-                    "SELECT header_hash, height, block FROM full_blocks "
-                    "WHERE height >= ? AND in_main_chain=1 ORDER BY height",
-                    (height,),
-                )
-                block_batch = []
-                start_time = time.monotonic()
-                logger.warning(f"starting test {start_time}")
-                worst_batch_height = None
-                worst_batch_time_per_block = None
-                peer_info = peer.get_peer_logging()
-                async for r in rows:
-                    batch_start_time = time.monotonic()
-                    with enable_profiler(profile, height):
-                        block = FullBlock.from_bytes(zstd.decompress(r[2]))
-                        block_batch.append(block)
-                        assert block.height == monotonic
-                        monotonic += 1
-                        assert prev_hash is None or block.prev_header_hash == prev_hash
-                        prev_hash = block.header_hash
-                        if len(block_batch) < 32:
-                            continue
-                        if keep_up:
-                            for b in block_batch:
-                                await full_node.add_unfinished_block(make_unfinished_block(b, constants), peer)
-                                await full_node.add_block(b)
-                        else:
-                            success, summary, _ = await full_node.add_block_batch(block_batch, peer_info, None)
-                            end_height = block_batch[-1].height
-                            full_node.blockchain.clean_block_record(end_height - full_node.constants.BLOCKS_CACHE_SIZE)
-                            if not success:
-                                raise RuntimeError("failed to ingest block batch")
-                            assert summary is not None
-                        time_per_block = (time.monotonic() - batch_start_time) / len(block_batch)
-                        if not worst_batch_height or worst_batch_time_per_block > time_per_block:
-                            worst_batch_height = height
-                            worst_batch_time_per_block = time_per_block
-                    counter += len(block_batch)
-                    height += len(block_batch)
-                    print(
-                        f"\rheight {height} {time_per_block:0.2f} s/block   ",
-                        end="",
-                    )
-                    block_batch = []
-                    if check_log.exit_with_failure:
-                        raise RuntimeError("error printed to log. exiting")
-                    if counter >= 100000:
-                        counter = 0
-                        print()
-                end_time = time.monotonic()
-                logger.warning(f"test completed at {end_time}")
-                logger.warning(f"duration: {end_time - start_time:0.2f} s")
-                logger.warning(f"worst time-per-block: {worst_batch_time_per_block:0.2f} s")
-                logger.warning(f"worst height: {worst_batch_height}")
-                logger.warning(f"end-height: {height}")
-            if node_profiler:
-                (root_path / "profile-node").rename("./profile-node")
+from tests.util.full_sync import FakePeer, FakeServer, run_sync_test
 @click.group()